dehnert
2c231a794d
SCC decomposition now correctly ignores zero-entries in the matrix.
Former-commit-id: 351c0ac6ad
11 years ago
sjunges
9da54842b7
remove stray symbol
Former-commit-id: a6c18ae7f9
11 years ago
dehnert
fff4e61fc3
Changed interface of matrix builder slightly to be able to also not force the resulting matrix to certain dimensions, but merely to reserve the desired space.
Former-commit-id: e36d05398e
11 years ago
dehnert
f767cfe844
Started to modify the matrix builder to be a bit smarter about preallocation.
Former-commit-id: 50be5c8af1
11 years ago
dehnert
ac420f13d0
Fixed some warnings in various places.
Former-commit-id: fbfbfc2bcb
11 years ago
PBerger
72af8c7246
Added missing (but implicitly declared) template instance.
Former-commit-id: 23a897d83e
11 years ago
dehnert
ab58103555
Started to pimp matrix. First step: added proper methods setColumn/setValue that operate on a matrix entry and removed the non-const versions of getColumn/getValue. Added a typedef for the index type in the matrix so that it becomes possible to have matrices with a different index type (e.g. 32-bit values).
Former-commit-id: 3cc0fdf9ee
11 years ago
dehnert
01cefbb2c0
Modified the multiplication of a sparse matrix with a dense vector to only use the parallel version if available and the number of nonzero entries exceeds a certain threshold.
Former-commit-id: 07957b2d29
11 years ago
dehnert
d40573640f
Dropped our current Tarjan-implementation in favour of the path-based algorithm by Gabow (and others) as this seems to perform a lot better (at when comparing our implementations).
Former-commit-id: 5cfeb85193
11 years ago
masawei
52cfe9f02d
Fixed some compile errors.
- Added a missing inlude (boost/functional/hash.hpp) to SparseMatrix.h. I don't know how this could have been compiled without.
- Changed a return type in the stub section of the GurobiLpSolver to void. Not correctly overwrites the base class function.
- Went through the change history of the SparseMarkovAutomatonCslModelchecker.h to correctly integrate all changes made in this branch with the changes of the other branches.
Former-commit-id: 43ce12274b
11 years ago
PBerger
ea427fcde1
Fixed include directories for CUDA Plugin in CMakeLists.txt
Refactored all code related to the SPMV kernels to work with float.
Wrote a test that determines whether the compiler uses 64bit boundary alignments on std::pairs of uint64 and float.
Introduced functions that allow for conversions between different ValueTypes (e.g. from float to double and backwards).
Former-commit-id: 830d24064f
11 years ago
PBerger
a39e9a821f
Fixed a type error in TBB implementation.
Former-commit-id: 680f43b36a
11 years ago
PBerger
73ddba5b29
Merged master, applied fixes.
Added feedback from the cuda plugin and return of iteration count.
Former-commit-id: 711ca3d9ec
11 years ago
dehnert
7c5603de3e
Improved performance of the expression parser a bit more.
Former-commit-id: 7a0ae116c9
11 years ago
dehnert
40c698af90
Some fixes to make new SMT framework compile with clang under Mac OS (includes fixes to some initializiation ordering warnings). Bugfix for PRISM parser to correctly handle formulas.
Former-commit-id: d513476066
11 years ago
PBerger
d2f4c85711
Made changes to comply with new SparseMatrix Interface (YUCK).
Fixed tests, all that stuff.
Former-commit-id: c78de5f8ce
11 years ago
dehnert
671797738a
Now the parameter that is set for dynamic reordering actually gets passed to CUDD.
Former-commit-id: 46676dc9d1
11 years ago
David_Korzeniewski
a815a6f425
Implemented allSat with z3 and test
Former-commit-id: 3795fc00c2
11 years ago
David_Korzeniewski
93c03fff3f
Fixed order of checks in Z3ExpressionAdapter, fixed missing override of isVariable in VariableExpression, removed unnecessary exception in Z3SmtSolver model generation
Former-commit-id: ca5f876655
11 years ago
dehnert
caf96c04e0
Extended DD interface by methods to generate explicit row-grouped matrices from DDs.
Former-commit-id: 1945d7be6d
11 years ago
dehnert
8587f68eb1
Fixed toMatrix conversion using ODDs. The next step is to generate non-deterministic matrices, i.e., matrices with row groups.
Former-commit-id: e4a9c5f0ed
11 years ago
dehnert
236e7fa290
Another step towards generating explicit data structures from DDs using ODDs.
Former-commit-id: 5b7e3e8680
11 years ago
dehnert
f12ff82baf
Added getNodeCount for ODD and fixed a bug concerning boolean meta variables.
Former-commit-id: 79eb69226b
11 years ago
dehnert
5d53c6efa5
Added ODD-concept to easily convert between DD-based and explicit formats.
Former-commit-id: f2a2a002b7
11 years ago
dehnert
dd73387ed1
Add missing case.
Former-commit-id: b30aa3bc0d
11 years ago
dehnert
72cc5f2188
Added 'power' as a binary operator in expression classes and expression grammar.
Former-commit-id: c58321709e
11 years ago
PBerger
7ab2a84c0f
Small beauty fixes to the Cudd Interface
Former-commit-id: 631d5a20bd
11 years ago
dehnert
63f55b38f0
Removed debug output that was - of course - never there. (You saw nothing!)
Former-commit-id: 9249928f54
11 years ago
dehnert
7b2def2b11
Added function to retrieve the minterms of a DD as an expression and added corresponding test.
Former-commit-id: afaf1f02a3
11 years ago
dehnert
e79fa50999
Changed naming of DD variables belonging to one meta variable slightly: only integer-valued meta variables now get a '.i' suffix to denote their i-th bit.
Former-commit-id: 771312ac31
11 years ago
dehnert
60b2145461
Added function to DD interface that creates a nested if-then-else expression that represents the very same function as the DD. Added a test for this functionality. Added some methods offereded by Cudd to simplify DDs.
Former-commit-id: 4fc816f64b
11 years ago
dehnert
1513241985
Added functions for more efficiently retrieving the DD for 'greater than constant', 'greater or equal than constant' and 'notZero'.
Former-commit-id: 9d80c29f27
11 years ago
dehnert
b1f22c1747
Added shortcut DD interface to compute \'greaterZero\' on a DD.
Former-commit-id: 65585533fd
11 years ago
dehnert
9e506f40bc
Some fixes for MSVC. :P
Former-commit-id: 1429e54f73
11 years ago
dehnert
6a2d75d68d
Some changes in anticipation of integrating MEDDLY.
Former-commit-id: 0f7a71ec9b
11 years ago
dehnert
45486600f7
Made parts of the interface of the DdManager protected (because they shouldn't be accessible from the outside world).
Former-commit-id: bf52a653b8
11 years ago
David_Korzeniewski
4e6c9b7d6b
Implemented translating z3 expressions to storm expressions
Former-commit-id: 945ce77e35
11 years ago
dehnert
686618e6e2
Added missing header to (hopefully) fix MSVC problems.
Former-commit-id: 0247ce1e35
11 years ago
dehnert
29d8111991
Adapted Gurobi and glpk LP solvers to expression-based interface. Adapted tests and made them work again.
Former-commit-id: 62379ddafd
11 years ago
dehnert
d5c2f9248f
Finished linear coefficient visitor and adapted glpk solver to new expression-based LP solver interface.
Former-commit-id: ba1d3a912f
11 years ago
dehnert
389fddc996
Added some more methods to valuations. Changed visitor invocation slightly. Moves ExpressionReturnType in separate file. Finished linearity checking visitor. Started on visitor that extracts coefficients of linear expressions.
Former-commit-id: 6e3d0ec910
11 years ago
dehnert
57a8381f91
If requested, the DD iterator can now skip meta variables which are 'don't cares' for the function value.
Former-commit-id: 061cb5f0fa
11 years ago
dehnert
f60ea09cf4
Valuations now have methods to check whether they contain a given identifier.
Former-commit-id: 541c27d543
11 years ago
dehnert
024b98978f
Made internal changes to SimpleValuations to (hopefully) make it nice and fast.
Former-commit-id: 1e9f18f522
11 years ago
dehnert
3158d19123
Started working on adapting LP solver interface to new expressions.
Former-commit-id: 6131736a7f
11 years ago
dehnert
9d3e78ab89
Cudd now gets 2GB instead of 2MB by default.
Former-commit-id: 06cf809493
11 years ago
dehnert
db232fe39b
Moved from pair to MatrixEntry as the basic building block of the matrix. Now matrix elements can be accessed in a more readable way.
Former-commit-id: f6514eb0cd
11 years ago
dehnert
2d8cc2efcd
Added reordering functionality to DD interface.
Former-commit-id: ffb8ad62f1
11 years ago
dehnert
92ee6187fa
Added more query methods to expressions. SparseMatrix now keeps track of non zero entries and models show correct number of transitions by referring to nonzero entries rather than all entries in the matrix.
Former-commit-id: 48180be2fe
11 years ago
David_Korzeniewski
83d2a1c315
Adapted Z3ExpressionAdapter to deletion of constant expressions. Added functionality to autocreate variables in the solver. Added function to get variables and their types from an expression.
Former-commit-id: 29f8e2fb70
11 years ago