dehnert
e49814d391
Modified pctl/csl/ltl options to now take formulas instead of files. Prefixed the macros with STORM_. Moved these macros into a file in the utilities. Modified architecture of the exception classes slightly. Threw away all the contents of main(). This will now be build from scratch.
Former-commit-id: 89d94f7957
11 years ago
David_Korzeniewski
ab1bbf25af
Possible fix for gcc & clang
Former-commit-id: 828ce1843c
11 years ago
David_Korzeniewski
31c1357efa
alternative all sat callback
Former-commit-id: 6fd7de7e51
11 years ago
dehnert
5ecc96fa3a
Fixed some more places in the code to use the new option system.
Former-commit-id: 15ff64f1dc
11 years ago
dehnert
a995d7dd4a
The tests now run fine with the new option system.
Former-commit-id: 6d6c510131
11 years ago
dehnert
1cd01e3f28
Adapted all places that are accessing the settings to the new interface. It now compiles again with a lot of linker errors (because of method bodies that are not yet present).
Former-commit-id: 01a33e479d
11 years ago
dehnert
9ad12616e2
Renamed files in settings module a bit. Started on the pseudo-modular module-settings.
Former-commit-id: b3162aa86b
11 years ago
dehnert
96e1f8faf9
Renamed Settings class to SettingsManager.
Former-commit-id: 2b33f4c8d0
11 years ago
dehnert
9569426c86
Moved option registration to the settings class (so it's not deceentralized any longer). This enables to build storm as a library and on top of that build some exectuables, which saves a lot of compile time as soon as several targets have to be built or one switches between targets.
Former-commit-id: 69e0d526c7
11 years ago
David_Korzeniewski
6dd69cca3c
Added interpolation methods to smt-solver interface.
Former-commit-id: a9b19cd0aa
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
dehnert
aecd0e3cb8
Made Storm compile again without Z3: guarded some header inclusions and function definitions/implementations. Also guarded the tests that require certain libraries (like Gurobi, glpk, Z3), so that tests do not fail any more when the libraries are not available.
Former-commit-id: 307036e25c
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
David_Korzeniewski
3887cb57aa
Fix for temporaries and non const references
Former-commit-id: 4eadf6cdab
11 years ago
David_Korzeniewski
52d3d91060
Implemented Unsat Core/Assumtions & simple test
Former-commit-id: f79ee3a809
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
PBerger
b7ad4398e2
Fixed an error in the interface of the LpSolvers.
Former-commit-id: 65e415efb2
11 years ago
David_Korzeniewski
a0319cb6e7
Model Generation and Tests for translating from z3 to storm
translating from z3 to storm has still some errors
Former-commit-id: 2a46b6c615
11 years ago
David_Korzeniewski
9a7b4f69ef
More tests and some small bugfixes for Z3SmtSolver
Former-commit-id: 71def90649
11 years ago
David_Korzeniewski
45bc8ea665
Conditional compilation for all parts using z3 by checking STORM_HAVE_Z3
Added first simple tests for Z3SmtSolver and Z3ExpressionAdapter
Former-commit-id: 77ade5ffa6
11 years ago
David_Korzeniewski
37ef3feebb
Fixed return type of addBinaryVariable
Former-commit-id: 44fc99b9a3
11 years ago
David_Korzeniewski
4e6c9b7d6b
Implemented translating z3 expressions to storm expressions
Former-commit-id: 945ce77e35
11 years ago
dehnert
66d6fa3bb4
Fixed wrong type.
Former-commit-id: 59e08c3669
11 years ago
dehnert
9e746549a8
Fully adapted MILP-based counterexample generator to new LP solver interface.
Former-commit-id: 83f3b8c507
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
3158d19123
Started working on adapting LP solver interface to new expressions.
Former-commit-id: 6131736a7f
11 years ago
David_Korzeniewski
29083cc89c
Implemented asserting expressions and checking satisfiability with z3
Former-commit-id: bb49a49226
11 years ago
David_Korzeniewski
98f87a5e6d
Adapted Z3ExpressionAdapter for new expressions
SmtSolver now not copyable
Former-commit-id: e0d17fd21c
11 years ago
David_Korzeniewski
f69b79593c
initial interface for smt solver wrappers
Former-commit-id: e43b7afb3c
11 years ago
dehnert
33cce28df8
Fixed minor bug MILP-based minimal command set generator. GurobiLpSolver is now able to deal with constraints involving several instances of the same variable.
Former-commit-id: 4b5575a886
11 years ago
sjunges
0eb13c6415
fixed a lot of unused variable warnings
Former-commit-id: 806f74b30d
11 years ago
dehnert
12743e0a7e
Moved from additional row grouping to the one embedded in the matrix itself.
Former-commit-id: 9d7a1fff10
11 years ago
PBerger
68a6e533be
Added error handling in GurobiLpSolver.cpp
Fixed a bug related to commit 486e99d6ae
[formerly 1300d77ae8
] where updateModel was not called before adding constraints in the GurobiLpSolverTest.cpp
Former-commit-id: 9f619e5039
11 years ago
PBerger
a6e7e6b4e0
Edited GurobiLpSolver.cpp, added the error code to the messages.
Former-commit-id: d14dc05cda
11 years ago
PBerger
9d1e53cff9
Added a missing include for uint_fast64_t to be recognized as a type
Former-commit-id: 4ccde721bb
12 years ago
dehnert
486e99d6ae
Added signal handler for SIGTERM. Introduced delayed update for LP solvers to reduce overhead.
Former-commit-id: 1300d77ae8
12 years ago
dehnert
42708a6d21
Added utility header for all parts that use std::swap.
Former-commit-id: 55a2f56440
12 years ago
dehnert
36fb44e206
Added functional tests for nondeterministic linear equation solvers. Added functional tests for LPs in addition to the existing MILP tests.
Former-commit-id: 8c0fa08f2d
12 years ago
dehnert
514aace4fd
Added function tests for both glpk- and Gurobi-based LP solver implementations. Found and fixed some bugs while doing this.
Former-commit-id: 99e58097f7
12 years ago
dehnert
c5985be437
Minor fixes for GlpkLpSolver.
Former-commit-id: 07595da7f3
12 years ago
dehnert
8ebd924ca6
Further work on refactoring solvers: cleaned LP solver interface a bit and adapted glpk- and Gurobi-based implementations of the interface.
Former-commit-id: 25b7a22bcc
12 years ago
dehnert
588a4b60b6
Refactored linear equation solvers and nondeterministic linear equation solvers. Added functional tests for both.
Former-commit-id: 0abb11828a
12 years ago
dehnert
79730379e4
Started refactoring the linear equation system solvers.
Former-commit-id: 72d647fd42
12 years ago
dehnert
72531bcebb
Added proper TBB multi-threading to all operation relevant to model checking MDPs.
Former-commit-id: dcb4bde1d3
12 years ago
dehnert
cdc369b96a
Temporarily removed the detection of the repository version of TBB from CMakeLists.txt. Corrected TBB sparse matrix-vector multiplication. Added TBB parallel vector addition.
Former-commit-id: f90ae764c8
12 years ago
dehnert
a26f63be30
Finished reworking the sparse matrix implementation. Adapted all other classes to the (partially) new API of the matrix.
Former-commit-id: 2c3b5a5bc3
12 years ago
dehnert
8a47d03cf7
Started to rework the interface of the sparse matrix class.
Former-commit-id: 6ae2699da6
12 years ago
dehnert
84bd5f3b40
Renamed ConstTemplates to constants. Removed all calls to constGetZero, constGetOne and constGetInfinity by the new names. Created performance test for bit vector iteration.
Former-commit-id: 6d90ec961e
12 years ago