dehnert
d6a299e799
MathSAT tests now running fine again.
Former-commit-id: 35083ea120
11 years ago
dehnert
99d9a9710d
Further steps to make everything work again.
Former-commit-id: 3f45a49dab
11 years ago
dehnert
7ec3e8b214
Further fixes for new variable handling. libstorm now compiles again, yay.
Former-commit-id: a9ac5c0356
11 years ago
dehnert
f76d0f93eb
Adapted LP solver interface to new variable handling.
Former-commit-id: c2a7eea5db
11 years ago
dehnert
7ea6ec3644
Further refactoring.
Former-commit-id: 7769132a68
11 years ago
dehnert
398f6c4e86
Partly adapted code to new 'type system'.
Former-commit-id: 6c200df5f0
11 years ago
dehnert
983a7d78c2
Further work on expressions.
Former-commit-id: 4774f0136d
11 years ago
dehnert
fff18f2789
Intermediate commit (refactoring expressions).
Former-commit-id: e7cc7e95c2
11 years ago
dehnert
85a4376e39
Now StoRM can be properly compiled without support for MathSAT if needed.
Former-commit-id: 28da4f5ed8
11 years ago
dehnert
f54b5671ea
Done refactoring MathSAT expression adapter.
Former-commit-id: 6edb98b86c
11 years ago
dehnert
84bfd58884
Minor refactoring of Z3 expression adapter.
Former-commit-id: b31ae87a98
11 years ago
dehnert
c859029094
Added some checks for illegal return values.
Former-commit-id: 88d5942780
11 years ago
dehnert
b5d55335a6
All tests passing again.
Former-commit-id: ffa8bef2d2
11 years ago
dehnert
ba14ba3613
Further work on MathSAT solver.
Former-commit-id: dd67b23505
11 years ago
dehnert
81571878f7
Further refactoring of MathSAT solver.
Former-commit-id: 317a9f9545
11 years ago
dehnert
c474920fa4
Started refactoring SMT solvers. Now displaying MathSAT version in CLI.
Former-commit-id: 1736a0bb6b
11 years ago
dehnert
7ff3dcecfb
Added test for interpolation to MathSat tests.
Former-commit-id: ac94857726
11 years ago
dehnert
d8be64f0d7
Started on making MathSatSmtSolver work properly.
Former-commit-id: c370658b26
11 years ago
dehnert
3231ea6c06
Moved to new macros.
Former-commit-id: d97c947c22
11 years ago
dehnert
39fb2650cd
Included missing header.
Former-commit-id: dd278656bf
11 years ago
David_Korzeniewski
25d87bae06
Builds fine, still no tests yet
Former-commit-id: 3d9d85679a
11 years ago
David_Korzeniewski
40e07b2ea5
Interpolation and AllSat implemented.
Tests pending, still some issues.
Former-commit-id: 7d94cdbc0c
11 years ago
David_Korzeniewski
56edf1e126
Initial MathSat integration.
Expression adapter, solving, unsat assumptions implemented
cmake and tests missing
allsat and interpolation not yet implemented
Former-commit-id: 5177775fbe
11 years ago
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