dehnert
12743e0a7e
Moved from additional row grouping to the one embedded in the matrix itself.
Former-commit-id: 9d7a1fff10
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
11 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
11 years ago
dehnert
a271e5ce63
Working towards making every (remaining) test work
Former-commit-id: e4560e07f2
11 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
11 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
11 years ago
dehnert
9e941e6b4a
Added scheduler classes. Added method to model classes that applies a scheduler.
Former-commit-id: 73a4be11b2
11 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
61e12601ed
Further step towards refactored ExplicitModelAdapter.
Former-commit-id: 8abc07a366
12 years ago
dehnert
947581dd25
Refactored and fixed bugs in explicit model adapter. Added support for labeling of choices of a model. The explicit model adapter uses that functionality to label each choice with the involved PRISM commands.
Former-commit-id: 818431d6e9
12 years ago
PBerger
e69c9f1962
Added all options from StoRM
Rewrote all calls to the Settings instance with the new Syntax
Implemented new ArgumentValidators.h
Former-commit-id: b4ab63f8f2
12 years ago
PBerger
01fd3c18e3
Added move constructors, added move-calls where fitting.
Former-commit-id: e73336c816
12 years ago
PBerger
fb3209dfc3
Added missing template parameters in the abstract models
Former-commit-id: 05a07d1c59
12 years ago
PBerger
78184f9537
Added a Hash Class in the Utility Namespace.
Added a function getHash() which returns a size_t to most of the used Models and Containers.
Former-commit-id: ed52aa3996
12 years ago
PBerger
d596f126b2
Fixed/added missing Copy Constructors for Models and the SparseMatrix
Former-commit-id: 730eaae49f
12 years ago
PBerger
b978a4d311
Added more move constructors.
Former-commit-id: 9770365fbb
12 years ago
PBerger
89909fe8dc
Edited all Parsers to lose its class.
Modified many classes to provide a reference-constructor.
Fixed a few bugs in Tests.
Former-commit-id: c31fe95aae
12 years ago
dehnert
f44f0ce410
Cleaned interfaces of models from std::shared_ptr. Improved some code in graph utility.
12 years ago
gereon
a868980466
Fixed code so that tests compiles.
12 years ago
gereon
3b76126f6b
Split PrismParser and PrismGrammar in differenc object files.
Added reset method for grammars, now we can parse multiple files in one program execution.
Added test for mdp parsing.
12 years ago
Lanchid
5b57728d7e
Merge branch master into PrctlParser
12 years ago
dehnert
0f9f5e67f6
A few minor fixes. Removed test for reward model.
12 years ago
dehnert
8c248c05c5
Renamed NonDeterministic to Nondeterministic in all places. Fixed (hopefully) all occurrences of these names. Implemented Prob0A algorithm.
12 years ago
dehnert
84c159feba
Moved model information output to super class. Moved methods to determine data structure size to superclass(es). Added missing getType methods for some models.
12 years ago
dehnert
7d95a45633
Fixed bug in AbstractModelChecker: it does now correctly inherit from a lot more interface classes. NOTE: checking a formula on a model checker that does not support it failed silently. This should NOT be the case. Re-enabled DEBUG option for cmake. NOTE: why was this disabled anyway? Introduced another layer AbstractDeterministicModel and AbstractNonDeterministicModel in model hierarchy to allow for easily distinguishing these classes. Made necessary adaptions in (hopefully) all classes. Move the graph analyzer to utility folder.
12 years ago
gereon
54565ddd55
changed rowMapping to vector<int>
12 years ago
gereon
583ebf62bd
made rowMapping from NDSTParser available in MDP model class
12 years ago
gereon
1d1f9da315
made rowMapping from NDSTParser available in MDP model class
12 years ago
PBerger
7800132684
Added Mdp Class, Parser and support in the AutoParser.
Added Test for MdpParser
12 years ago
gereon
b4862360ba
made Ctmc and Dtmc subclasses of AbstractModel
implement getType()
fixed typo
12 years ago
gereon
1776f8ce12
first steps towards an AutoParser
renamed AutoTransitionParser to AutoParser
created new base class for all models
12 years ago
PBerger
557461a77d
Renamed SquareSparseMatrix to SparseMatrix
12 years ago
dehnert
86c7ae3f5c
Added BoundedEventually as a convenience operator.
Included check for illegal atomic propositions.
Added exception class to be raised in case a property is invalid for the respective model.
12 years ago
dehnert
58cf8118fe
Initial version of reward model checking for DTMCs. Added two convenience operators to PCTL (Eventually and Globally) and added missing reward formulas.
12 years ago
PBerger
f983317b54
Renaming MRMC to STORM, see #42
Markt und Straßen stehn verlassen,
still erleuchtet jedes Haus,
Sinnend' geh ich durch die Gassen,
alles sieht so festlich aus.
An den Fenstern haben Frauen
buntes Spielzeug fromm geschmückt,
Tausend Kindlein stehn und schauen,
sind so wunderstill beglückt.
Und ich wandre aus den Mauern
Bis hinaus ins freie Feld,
Hehres Glänzen, heil'ges Schauern!
Wie so weit und still die Welt!
Sterne hoch die Kreise schlingen,
Aus des Schnees Einsamkeit
Steigt's wie wunderbares Singen-
O du gnadenreiche Zeit!
Merry Christmas commit ;)
12 years ago
gereon
364d8e4861
added Matrix::getRowSum()
... and using it in the DTMC check
12 years ago
dehnert
b26a731383
Added reward parsing:
* Transition-based rewards are parsed using the existing (Deterministic)SparseTransitionsParser.
* State-based rewards are parsed using a new SparseStateRewardParser that parses lines consisting of a state and an associated reward.
* The Dtmc class now stores the two reward models.
* The DtmcParser class now parses up to one transition-based and one state-based reward file. They may, however, be omitted in which case the respective reward model is set to null.
12 years ago
gereon
37f6337fa5
using new iterator for checking matrix
SquareSparseMatrix now has a new iterator over elements in a row.
Dtmc uses this iterator to check the probability matrix.
12 years ago
gereon
4d4219991c
renaming sanity check, fix brackets
12 years ago
Lanchid
afb0373358
Added DtmcParser class that parses a whole DTMC, making use of the
labeling and transitions parser.
Removed the parseDtmc function from IoUtility, as it became obsolete
with the DtmcParser class, fitted test cases accordingly.
12 years ago
gereon
5cc8e8bb2d
modified sanity check to use internal data structures...
12 years ago
gereon
83e660ac3d
check is sums of each row is one (or zero for "imaginary" states)
12 years ago
PBerger
96c7dd9a79
Added the (default) external build path /build to git ignore.
Added, fixed, refactored Include Guards in ALL Files, should be consistent now.
12 years ago
PBerger
1f36724cc2
Refactored StringOutput to use std::to_string
Fixed Reference/Pointer bugs in all formulas.
Implemented EigenDtmcPrctlModelChecker
Replaced uses of int32 with 64bits
12 years ago
gereon
4095e87282
changing pointer to std::shared_ptr
parsers return some kind of object and it is not clear who owns this object,
i.e. who is responsible to delete it.
12 years ago