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
12 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
dehnert
629448c312
First working version of MaxSAT-based minimal command counterexample generation.
Former-commit-id: 6dc49157f9
12 years ago
dehnert
2cc5b6e080
Added Z3ExpressionAdapter to translate IR expressions to the Z3 format. Improvements to label-/command set generators. Disabled MILP-call from main().
Former-commit-id: 7128ab4477
12 years ago
dehnert
e3234b54f3
Step towards minimal command generator using MaxSAT and model checking.
Former-commit-id: 4237447c44
12 years ago
dehnert
a45e9423b8
Sparse matrix can now also be used without knowing the number of rows/columns/nonzeros upfront. Adapted ExplicitModelAdapter to use that capability to not explore the state space twice. Added support for Z3 to CMakeLists.txt. Added correct submatrix checks for transition rewards in MDPs. Extended a test for the ExplicitModelAdapter a bit.
Former-commit-id: 105efc5342
12 years ago
dehnert
c82efc1f41
Minor fix.
Former-commit-id: 934f0d0f06
12 years ago
dehnert
129fd296d6
Several fixes. MinimalLabelSetGenerator can now treat labeled values.
Former-commit-id: 0fc3d8ead3
12 years ago
dehnert
a99bdf1b17
Switched to more elegant solution to query initial states of a model.
Former-commit-id: 9a5c90c5d5
12 years ago
dehnert
0f4e51e646
Changed notation to query option slightly.
Former-commit-id: 993a053306
12 years ago
PBerger
c242dcbd97
Refactored CMakeLists.txt for better editing and overview
Refactored all Defines for Gurobi, TBB, etc into the storm-config file
Fixed a missing cast int SymbolicModelAdapter.h
Fixed changed iterator structures in SparseMatrix.h
Fixed bugs in CuddUtility.cpp where a 64bit shift was executed on a 32bit literal (1 should be 1ull)
Fixed a Type Error in graph.h
Former-commit-id: 797b4da2eb
12 years ago
dehnert
b546118c98
Gurobi output now only gets printed to standard out and logfile if --debug has been set.
Former-commit-id: 4cd300ec5e
12 years ago
dehnert
5d76fd5ba0
Disabled model output to file.
Former-commit-id: be3eb00875
12 years ago
dehnert
014be3cb39
MinimalLabelSetGenerator can now handle multiple initial states properly.
Former-commit-id: 86f73a68a7
12 years ago
dehnert
f1c800f382
Minor fixes to MinimalLabelSetGenerator and AbstractModel.
Former-commit-id: 83ee7ae262
12 years ago
PBerger
f7a7ea8383
Fixed the StringValidator for the constants option
Fixed a bug in the MinimalLabelSetGenerator.h where a non static variable was initialized
Added the new constants option in storm.cpp
Former-commit-id: e73e69b1ce
12 years ago
dehnert
8f3182b520
Working (and most importantly refactored) version of MinimalLabelSetGenerator.
Former-commit-id: 150b7d87e5
12 years ago
dehnert
3c22a669af
On my way of refactoring the minimal label set generator. Intermediate commit: does not compile, so be careful when pulling.
Former-commit-id: debe3fa1ff
12 years ago
dehnert
5ff550194c
Minimal label set generator now works for coin example, yay
Former-commit-id: 9ab8552d82
12 years ago
dehnert
735cd2013f
Further work on minimal label set generator. Intermediate commit.
Former-commit-id: 0f123ae3c4
12 years ago
dehnert
1a20ce7f33
A few additions to the minimal label set generator.
Former-commit-id: 7886f378ce
12 years ago
dehnert
12a92fc6ee
Several fixes and additions to IR. Modifications to CMakeLists.txt of log4cplus to enable proper compilation under Mac OS. Fixes to coin2.nm. Added global variables to grammar and IR. Established basis for defining undefined constants of the model. Started to write MinimalLabelSetGenerator.
Former-commit-id: b65bb063fa
12 years ago
dehnert
85e674266d
Added support for linking against Gurobi to CMakeLists.txt. Prepared work on the generator of minimal label sets.
Former-commit-id: a7a87edcfe
12 years ago