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
f684ce7799
Removed obsolete constructors of sparse matrix class as the new matrix builder is supposed to be used anyway. Fixed some minor issues.
Former-commit-id: ee8a7cc440
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
81cf0e2b22
Added SparseMatrixBuilder class that actually builds the matrices. A call to build() will then generate the matrix. This eliminates superfluous checks in the matrix that slowed down performance.
Former-commit-id: af5d946fb8
12 years ago
dehnert
cf2b84b281
Further work on iterators for sparse matrix.
Former-commit-id: 8e78262161
12 years ago
David_Korzeniewski
91125c3c6d
Fixed build errors on Windows
Former-commit-id: 6ddc16cd5a
12 years ago
dehnert
97fb2f9750
All tests working with (partially) new sparse matrix implementation/interface.
Former-commit-id: 0272dd3524
12 years ago
dehnert
a271e5ce63
Working towards making every (remaining) test work
Former-commit-id: e4560e07f2
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
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
dehnert
d5cadc0f4b
Finalized interface of bit vector. Added unit tests for all methods of the bit vector.
Former-commit-id: 6c7834ed20
12 years ago
dehnert
07fbff7a07
Started refactoring bit vector class.
Former-commit-id: a2fecfce2b
12 years ago
dehnert
344e1b6dd3
Enabled checking of some untimed properties on Markov automata.
Former-commit-id: e71aa66c62
12 years ago
dehnert
dce43d78e7
Started implementation of time-bounded reachability of Markov automata.
Former-commit-id: 512bb117a6
12 years ago
dehnert
dabfb5e1dd
First working version of LRA computation for Markov automata.
Former-commit-id: d6c6870fd8
12 years ago
dehnert
339b598694
Enabled computation of LRA for individual maximal end components. It remains to compute the overall LRA value using the values for the individual MECs.
Former-commit-id: 47eb90e62c
12 years ago
dehnert
101c39f365
Added correct detection of states that possess infinite exptected time to reach a given goal set.
Former-commit-id: 4bc605d89d
12 years ago
dehnert
daea775263
Now rates get correctly transformed to probabilities + exit rates for Markov automata.
Former-commit-id: bf5ccfa813
12 years ago
dehnert
f1a9b1e602
First version of minimum expected time for Markov automata.
Former-commit-id: 6053be896e
12 years ago
dehnert
2cbdf56267
Fixed some bugs in bit vector and vector set that prevented the MEC decomposition from functioning correctly.
Former-commit-id: 51b6d7eb18
12 years ago
dehnert
f287b7e760
Further steps towards implementation of MEC decomposition.
Former-commit-id: 8166b3b923
12 years ago
masawei
84f6bf7104
Added a getBackwardsTransitions() to AbstractNondeterministicModel, since simple transposition does not yield correct results and for the computation of the backwards transitions the nondeterministic choice indices must be known.
|-> Ran the tests: all green.
Former-commit-id: be0d9de95a
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
eca717759a
Added functionality to apply a scheduler to a Markov automaton.
Former-commit-id: 2121c61b09
12 years ago
dehnert
9e941e6b4a
Added scheduler classes. Added method to model classes that applies a scheduler.
Former-commit-id: 73a4be11b2
12 years ago
dehnert
09f192b40f
Refactored SCC-Decomposition design as a preparation step for computing maximal end components of Markov automata.
Former-commit-id: 4596ba71ec
12 years ago
dehnert
66f15efbc6
Fixed memory bug in Markov automaton parser.
Former-commit-id: 444b834b91
12 years ago
dehnert
d725a3f898
Removed bit vector for storing markovian choices of MA. From now on, the first choice of a hybrid/Markovian state is the Markovian one.
Former-commit-id: 6b646597dc
12 years ago
dehnert
cebda374d1
Further step towards Markov automata parser.
Former-commit-id: 33e4634743
12 years ago
dehnert
d43318afd8
Added first version of MarkovAutomaton class.
Former-commit-id: c211dd9bf4
12 years ago
dehnert
141fdca6d7
Added initial version of MarkovAutomaton class.
Former-commit-id: 099b8b4a22
12 years ago
dehnert
4cdf1e6b7a
Fixed warning resulting from wrong initialization order.
Former-commit-id: b773000369
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
masawei
af0601c453
Made several changes.
- Fixed the infinite loop bug that occured when giving a filepath pointing to a directory instead of a file.
- The BitVector to Dtmc subsystem converter now supports an optional choice labeling.
- The output of the modelchecker to the log file is now suppressed while doing a counterexample generation.
- It is now possible to add more atomic propositions to the AtomicPropositionLabeling than previously declared (at the cost of one reserve per added ap beyond the maximum).
The maximum is then increased accordingly.
|-> As a result the state added for the Dtmc subsystem has now its own label.
Next up: Merge.)
Former-commit-id: 74c92aaea1
12 years ago
masawei
393a72d56f
Added handling of state and transition rewards to getSubDtmc().
Remark: I don't quite get the optional choice labeling in Dtmcs.
Whats its purpose?
Why is it undocumented in the Dtmc constructor, not supported by the parser but needed nevertheless?
Next up: Pretty up counterexample generation output.
Former-commit-id: c04063b608
12 years ago
masawei
ee1c1eb9b6
First implementation of the BitVector to Dtmc subsystem converter in Dtmc.h
-Had to add a addState function to AtomicPropositionLabeling to be able to throw out the unneeded states using the substates constructor while at the end adding the absorbing state and its label.
An alternative for that would be to provide a constructor taking the mapping and the single labelings vector as well as a getter for the single labelings.
-The --counterexample command now only uses the pctl file given as argument to it and therefore it is now superflous to give the --prctl command in that case.
-Also fixed a bug in the filter constructor of the BitVector.
Now it copies all bit values specified by the filter to the correct index of new instance instead of all to index 0.
Next up: Handle the optionals of the Dtmc when creating the sub-Dtmc.
Former-commit-id: b45ee94cb2
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
b18199d3ec
Further work on minimal label set generators.
Former-commit-id: 84e86f5842
12 years ago
dehnert
b860f16ada
Further work on MaxSAT-based minimal command counterexamples.
Former-commit-id: 4991bdcb3d
12 years ago
dehnert
e3234b54f3
Step towards minimal command generator using MaxSAT and model checking.
Former-commit-id: 4237447c44
12 years ago
dehnert
623d9ee7c4
Added capability to restrict model to certain action choices.
Former-commit-id: fb3c63c64f
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
129fd296d6
Several fixes. MinimalLabelSetGenerator can now treat labeled values.
Former-commit-id: 0fc3d8ead3
12 years ago
dehnert
61e12601ed
Further step towards refactored ExplicitModelAdapter.
Former-commit-id: 8abc07a366
12 years ago
dehnert
a08a403eec
Ongoing refactoring work on ExplicitModelAdapter.
Former-commit-id: 1212f84aad
12 years ago
dehnert
e2b0c4f1aa
Started refactoring ExplicitModelAdapter to finally make it nice.
Former-commit-id: 6df7e5d9fa
12 years ago
dehnert
f1c800f382
Minor fixes to MinimalLabelSetGenerator and AbstractModel.
Former-commit-id: 83ee7ae262
12 years ago
PBerger
e0ee4ea2fd
Implemented a method for generating a choiceLabeling based on the stateIds
Former-commit-id: d1eedecc22
12 years ago
dehnert
816f12f2f6
Added global variables to string output of probabilistic program. Added number of choices to model information output of nondeterministic models.
Former-commit-id: 63f2b9da7a
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