sjunges
5e428a795a
And more includes on the right spot.
Former-commit-id: 72bb348687
10 years ago
sjunges
3c2040f4b7
Removed many superfluous includes, added some source files -- towards faster compilation
Former-commit-id: a575a97d40
10 years ago
dehnert
04f789619c
some work towards eliminating compiler warnings
Former-commit-id: d1eca470a4
10 years ago
dehnert
a44a3554c8
Fixed minimal command counterexample generation.
Former-commit-id: 6e7e6208da
10 years ago
dehnert
a1dae8849e
Reworked (sparse) model files: moved them into their own namespace and deleted some functionality that is never used and not that nicely implemented.
Former-commit-id: d4e6df30b5
10 years ago
dehnert
b5f907d99d
Added propositional model checker. Put some of the new classes in new folders. Fixed an issue that prevented compilation.
Former-commit-id: 517a870d2f
10 years ago
dehnert
8a4706d9c9
A lot of work on model checker interfaces. In particular, the SCC elimination model checker is almost integrated.
Former-commit-id: bbf988c943
10 years ago
dehnert
b60c5ffdc0
Fixed a lot of tests, improved some things here and there.
Former-commit-id: baec0a4963
10 years ago
dehnert
650770148d
Main now compiles again, yay.
Former-commit-id: cc1307aea8
10 years ago
dehnert
b37e009168
Further steps to new expressions.
Former-commit-id: 4396857eff
10 years ago
dehnert
96086cb6d8
Fixed a bug in the option system and MILP-based cex generator. Now everything should work for the demo. :)
Former-commit-id: 3676ec7023
11 years ago
dehnert
de5f90fe4b
Rough version of refactored version of processing the options (in terms of computing something). Currently it is only capable of parsing the model and generating a counterexample.
Former-commit-id: 6a65cdd658
11 years ago
dehnert
266d660d89
Added functions responsible for printing the help. Started adapting the tests to the new option system.
Former-commit-id: 0407d8223e
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
96e1f8faf9
Renamed Settings class to SettingsManager.
Former-commit-id: 2b33f4c8d0
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
masawei
d75e32b83e
Renames the folder formula to properties and the namespace property to properties.
Former-commit-id: 236ed22c7d
11 years ago
masawei
1c4d7b9ef9
Some more testing.
Former-commit-id: 3105a0bf3b
11 years ago
masawei
ee1ebdf91d
Removed the visitor from LTL and refactured the formulas to use shared pointer in stead of standart pointer.
Next up: Continue testing.
Former-commit-id: 0103895e13
11 years ago
dehnert
9e746549a8
Fully adapted MILP-based counterexample generator to new LP solver interface.
Former-commit-id: 83f3b8c507
11 years ago
dehnert
db4721ce3a
Started adapting MILP-based counterexample generator to new LP solver interface.
Former-commit-id: b571d744db
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
a642ba6e72
Started adapting dependent classes to new PRISM classes.
Former-commit-id: 59155b5fc9
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
de44a1562c
Started writing the DD abstraction layer.
Former-commit-id: 8720a38b17
11 years ago
dehnert
6e63e1c296
Minor bugfix.
Former-commit-id: d53be4f673
11 years ago
PBerger
b9a4faea09
Removed unused named variables in MILPMinimalLabelSetGenerator.h
Former-commit-id: 7639927da6
11 years ago
dehnert
486e99d6ae
Added signal handler for SIGTERM. Introduced delayed update for LP solvers to reduce overhead.
Former-commit-id: 1300d77ae8
11 years ago
dehnert
35d16a1191
Replaced VectorSet bei boost::container::flat_set, which does essentially the same. Fixed a bug in sparse matrix creation.
Former-commit-id: cb632bcfd4
12 years ago
dehnert
cf2b84b281
Further work on iterators for sparse matrix.
Former-commit-id: 8e78262161
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
344e1b6dd3
Enabled checking of some untimed properties on Markov automata.
Former-commit-id: e71aa66c62
12 years ago
dehnert
0a89d65f93
Started refactoring Markov automaton model checker.
Former-commit-id: c4278de4f0
12 years ago
masawei
175e852956
Resolved problems resulting from merge.
- gcc 4.8 (and assorted libraries) does not provide an erase(const_iterator) method for std::list but only an erase(iterator).
This is in compliance with the c++11 draft N3337, which specifies the change from iterator to const_iterator only for "set, multiset, map [and] multimap" but not list.
Therefore the constant list iterators were replaced by non constant iterators in MaximalEndComponentDecomposition and Vector set.
The locations are marked with a FIXME, such that the const_iterator can be replaced back when gcc provides it.
- Fixed (completed) the stub implementation for the GurobiLpSolver in case that Gurobi is not present.
|-> Would not compile before due to missing functions and incorrect signatures.
- Switched to c++11 for gcc. Since gcc 4.8 provides full compliance to the c++11 standard.
|-> Initially hoped that it would fix the const_iterator problem, but it did not.
- Fixed the cmake warning concerning a missing whitespace between tokens in the last line of CMakeLists.txt.
Former-commit-id: f90768375e
12 years ago
dehnert
ea7f48cff6
Introduced solver header in utility to return standard solvers when requested.
Former-commit-id: 66bba17785
12 years ago
dehnert
a229b9b322
Refactored MILP-based command generator to use a general LpSolver interface, so other LP solvers may be used when needed.
Former-commit-id: 203ad6a499
12 years ago
dehnert
f35ac73547
Splitted VectorSet in header/source file which caused certain minor changes in its interface. Fixed some issues in the Markov automaton parser and made it substantially faster by dropping sscanf. This however introduces other limitations that need to be addressed in the future.
Former-commit-id: 44eb4aabc9
12 years ago
masawei
170306e46d
Moved SparseMatrix transposition function from AbstractModel (named: getBackwardsTransitions) to SparseMatrix (named: transpose) where it belongs.
- Fixed one problem marked FIXME in the transpose function. The need for a "sentinel" element was created by an off by one in the prior loop.
- Changed all occurences of SparseMatrix<bool> to SparseMatrix<T>. Now the only two types for which SparseMatrix is instantiated are double and int.
- Compiles again.
|-> Compile time seems to be roughly the same for clean; make all. For incremental builds I haven't tested yet.
Former-commit-id: 6d829e0903
12 years ago
dehnert
360b506afe
Sparse MDP model checker now correctly computes (memoryless) schedulers for Until and Reachability Reward formulas.
Former-commit-id: c756093fd4
12 years ago
dehnert
9e941e6b4a
Added scheduler classes. Added method to model classes that applies a scheduler.
Former-commit-id: 73a4be11b2
12 years ago
masawei
94d8a46b1d
Fixed some compile errors originating from the introductionof the new storm::storage::VectorSet.
- Also handled the case of a missing --prctl while using the counterexample generation.
- Remark: Some documentation for the VectorSet would have been nice.
Former-commit-id: c687b67454
12 years ago
dehnert
422da8f481
Added set class with an underlying vector container. Adapted code in counterexample generators to use the new set class. Still bugs in it though.
Former-commit-id: ac9993eab2
12 years ago
dehnert
e0fbb5cbea
Added proper treatment for both upper bound operators to counterexample generators. Added optional statistics output to SAT-based counterexample generator.
Former-commit-id: 5d471c6d00
12 years ago
dehnert
dc0be79172
Improved elimination of solutions in which the target states are not even reachable.
Former-commit-id: f3d917ef7b
12 years ago
dehnert
b74715a374
Force Gurobi to be more precise wrt. binary variables.
Former-commit-id: 860ec42ed1
12 years ago
dehnert
9143e09d86
Added some more output to counterexample generators for benchmarks.
Former-commit-id: 7e64b90de6
12 years ago
dehnert
47a05fc1b0
Beautified output of option system. Enabled command line interface of counterexample generation.
Former-commit-id: cecc5e85b3
12 years ago
dehnert
b18199d3ec
Further work on minimal label set generators.
Former-commit-id: 84e86f5842
12 years ago
dehnert
a2bba28f94
Moved static analysis for guaranteed label set computation into utilities and improved MILP-based approach by using this information.
Former-commit-id: 611867288a
12 years ago