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
dehnert
e3234b54f3
Step towards minimal command generator using MaxSAT and model checking.
Former-commit-id: 4237447c44
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
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
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
dehnert
15542d46da
Changes:
* included small consensus example
* made backward-transition generation more beautiful and versatile
* included Dijkstra search for most probable paths
* included first rough scheduler-guessing (there's room for improvement though)
Former-commit-id: db795fa1bf
12 years ago
dehnert
663e1b0a8f
Fixed wrong model name in dot output.
Former-commit-id: 44e70120eb
12 years ago
dehnert
41db9a8092
Small changes to MDP model checker.
Former-commit-id: df85f55866
12 years ago
PBerger
35c23525a1
Removed debug output from AbstractModel.h
Former-commit-id: 8e8e081a94
12 years ago
PBerger
01fd3c18e3
Added move constructors, added move-calls where fitting.
Former-commit-id: e73336c816
12 years ago
dehnert
f73342c56a
Corrected color output in dot export of models. Fixed minimumOperator stack in SparseMdpPrctlModelChecker a bit, but this needs some further work.
12 years ago
PBerger
484c4e8151
Added more debugging output into the MDP Model
Former-commit-id: 5c2d29f80b
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
PBerger
f4050e5b18
Edited Parsers, re factored interface into a single function without an encapsulating class. Warning, this is work in Progress and not yet compiling.
12 years ago
dehnert
e7601eb7b7
Included scheduler generation in model checking procedure for MDPs.
12 years ago
dehnert
fabf662edd
Added dot output for both deterministic and nondeterministic models. Fixed iterator bug in sparse matrix.
12 years ago
dehnert
4dadedf39d
Added methods to retrieve module index by variable name from IR. This fixes an issue in the symbolic adapter.
12 years ago
dehnert
f44f0ce410
Cleaned interfaces of models from std::shared_ptr. Improved some code in graph utility.
12 years ago
dehnert
14fae4883a
Added prob 0/1 precomputation for bounded-until model checking for DTMCs. The version for MDPs seems to perform worse: needs to be investigated.
12 years ago
dehnert
a619303a1a
Removed unnecessary command line utilities.
12 years ago
Lanchid
ec91dcbe2e
Merge branch master into LTLParser
12 years ago
dehnert
fbe1f41213
Removed GraphTransition class, which is now replaced by SparseMatrix in the instances where it was used before. Changed GraphAnalyzer accordingly and adapted tests.
12 years ago
dehnert
ed4c6c8429
Fixed SCC decomposition functions. Added performance tests for GraphAnalyzer.
12 years ago
dehnert
5f27a932a9
Moved SCC decomposition to AbstractModel class, which was possible due to virtual iterator facilities in model classes.
12 years ago
dehnert
69395face2
Moved creation of SCC-dependency graph into abstract model class. Added functionality to sparse matrix class to not give the number of nonzeros upfront, but to to grow on demand.
12 years ago
dehnert
2e8d264594
Minor changes to state labeling class:
* marked some methods as const
* renamed getAtomicProposition to getLabeledStates
12 years ago
dehnert
f899914799
Adapted the labeling class such that no raw arrays are included any more, but a vector instead.
12 years ago
Lanchid
5b57728d7e
Merge branch master into PrctlParser
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
4fd1d672ef
fixed valgrind errors
creating new shared_ptr instances from a raw pointer (i.e. shared_ptr<>(this) or alike) destroys the internal reference counting.
To make this work, one can use std::enable_shared_from_this(), which solves our problem here.
12 years ago
dehnert
57274b3f09
Fixed missing newline and warning about nested comments.
12 years ago
gereon
650a0f0a27
added documentation for AbstractModel and operator<< for ModelType
12 years ago
gereon
006c9e6b88
changed model base class
AbstractModel is the new base class for every model.
If requires all models to implement ``ModelType getType()``
And implements ``as<ModelClass>()`` performing a dynamic cast on a shared pointer, assuming that we will always use Models within shared pointers.
12 years ago