dehnert
b61090fe92
Merge branch 'master' into MinimalCommandCounterexample
Former-commit-id: 3a30ef5f18
11 years ago
dehnert
b18199d3ec
Further work on minimal label set generators.
Former-commit-id: 84e86f5842
11 years ago
dehnert
ad7f800ac0
Added examples from MILP-paper.
Former-commit-id: 6c8f918ed5
11 years ago
dehnert
c31dbc85a7
Made all examples from the MILP-paper work. Most of them are really slow though.
Former-commit-id: 1f3f5afb9a
11 years ago
masawei
b55932b212
Adapted subsystem generation to the use of the new subsystem checking method using bit vectors.
Compiles now.
Next up: Setting up the control flow to make it actually generate a critical subsystem.
Former-commit-id: a05fd42071
11 years ago
masawei
4dca7abd3f
Implementaed methods for checking until formula by providing the left and right states instead of the whole formula (same with bounded Until) in the SparseDtmcPrctlModelChecker, analouge to the SparseMdpPrctlModelChecker.
Reverted unnecessary changes to the AbstractModel checker.
Next on the list: Adapting the subsystem generation routine to the new method of providing the subsystem to the model checker.
Former-commit-id: 6c90c064a2
11 years ago
dehnert
86909937f3
Grammar now supports min/max/floor/ceil functions. Parsing still has errors though.
Former-commit-id: 5af975489b
11 years ago
dehnert
e8b83a6aab
Added synchronization cuts.
Former-commit-id: bb9cab2eeb
11 years ago
David_Korzeniewski
641c09dcfa
Fixed compile errors on windows caused by missing includes and use of initializer lists (not supported by vs11)
Former-commit-id: 294c26cd64
11 years ago
dehnert
e8f1c7c9ab
Fix to grammar to allow for empty probability in updates.
Former-commit-id: d13a5297a9
11 years ago
masawei
0cb390b186
More integration work.
Ran into problem with the AbstractModelChecker being declared const for the model check.
I use it for the subsystem generation and tell it what the current subsystem is. so I have two options:
1. Carry the subsystem as argument through all checking functions of the complete checking tree
2. Store the subsystem in the checker and use it in checkAp to induce the correct result back through the tree.
In the original implementation I used option 2.
But that does only work if it is not constant.
Former-commit-id: 8a833cc05e
11 years ago
dehnert
6a4d2183dc
Fix for SAT-based minimal counterexample generator: backward cuts are now fully correct again. Fix for PRISM grammar: missing update probabilities now default to one.
Former-commit-id: fc139c33d0
11 years ago
dehnert
8244420248
Some refactoring work.
Former-commit-id: 1e67f5cac8
11 years ago
masawei
4d161e5e8e
Began with integration of crit. subsystem generation into master.
Still some compile errors to fix.
Former-commit-id: 30dfdd2479
11 years ago
masawei
1716c45ec5
Fixed compile errors concerning the handling of the STORM_HAVE_Z3 flag and a missing include in IRUtility.h
Should now compile again.
Former-commit-id: a72c906fb0
11 years ago
dehnert
ae6838d786
Switched to different computation of smallest model.
Former-commit-id: 79b3394420
11 years ago
dehnert
54d28e5540
Further work on MaxSAT-based minimal command set generator.
Former-commit-id: 0c15787768
11 years ago
dehnert
fda9c43e86
Fix for SMT-based minimal command set generator. Minor fixes to string output of expression classes.
Former-commit-id: 316a762d74
11 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
11 years ago
dehnert
629448c312
First working version of MaxSAT-based minimal command counterexample generation.
Former-commit-id: 6dc49157f9
11 years ago
dehnert
b6ff62e689
Towards adding more cuts to MaxSAT-based minimal command counterexamples. Some fixes here and there along the way.
Former-commit-id: 15ea8544fd
11 years ago
dehnert
d6c59e2ca3
Further work on MaxSAT-based minimal counterexample generator.
Former-commit-id: 847a6e202c
11 years ago
dehnert
b860f16ada
Further work on MaxSAT-based minimal command counterexamples.
Former-commit-id: 4991bdcb3d
11 years ago
dehnert
aec2596753
Several fixes for the IR. Weakest precondition computation is now supported for IR expressions.
Former-commit-id: 00387e59fc
11 years ago
dehnert
f7a578e65d
Major change in PRISM grammars and IR: the IR now uses unique pointers instead of shared pointers to express ownership of objects more clearly.
Former-commit-id: 5b0228ee3b
11 years ago
dehnert
20ae92e1ba
Added support for cloning IR expressions.
Former-commit-id: 913269b3a5
11 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
11 years ago
dehnert
bd3edb5f8b
Naive enumeration of command set works.
Former-commit-id: 45466d1edc
11 years ago
dehnert
a7dda9131b
Intermediate commit to switch workplace.
Former-commit-id: 2ade4ee21f
11 years ago
dehnert
e3234b54f3
Step towards minimal command generator using MaxSAT and model checking.
Former-commit-id: 4237447c44
11 years ago
dehnert
f33bf69daa
Another merge.
Former-commit-id: 00450616d1
11 years ago
dehnert
2e570f6311
Merge.
Former-commit-id: 572cdb80fc
11 years ago
dehnert
623d9ee7c4
Added capability to restrict model to certain action choices.
Former-commit-id: fb3c63c64f
11 years ago
dehnert
121cbb7610
ExplicitModelAdapter now labels updates for synchronizing commands correctly.
Former-commit-id: ae9e6c9bda
11 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
11 years ago
dehnert
c82efc1f41
Minor fix.
Former-commit-id: 934f0d0f06
11 years ago
dehnert
f7293ee4a9
Merge branch 'master' into MinimalCommandCounterexample
Conflicts:
src/counterexamples/MinimalLabelSetGenerator.h
src/storm.cpp
Former-commit-id: 75f9e8adef
11 years ago
dehnert
129fd296d6
Several fixes. MinimalLabelSetGenerator can now treat labeled values.
Former-commit-id: 0fc3d8ead3
11 years ago
dehnert
a99bdf1b17
Switched to more elegant solution to query initial states of a model.
Former-commit-id: 9a5c90c5d5
11 years ago
dehnert
84f1b192b4
Added globally unique indexes to updates in IR. Finalized support for labeled values in ExplicitModelAdapter. Modified tests to comply with the new usage of ExplicitModelAdapter.
Former-commit-id: f6d5a33d6d
11 years ago
dehnert
61e12601ed
Further step towards refactored ExplicitModelAdapter.
Former-commit-id: 8abc07a366
11 years ago
dehnert
a08a403eec
Ongoing refactoring work on ExplicitModelAdapter.
Former-commit-id: 1212f84aad
11 years ago
dehnert
e2b0c4f1aa
Started refactoring ExplicitModelAdapter to finally make it nice.
Former-commit-id: 6df7e5d9fa
11 years ago
dehnert
fdfb8ecc97
Minor fixes.
Former-commit-id: f2298d312a
11 years ago
dehnert
f39fb24f65
Removed pointers from Model Checker Interface (and callback methods in formulas). From now on, the results are returned in form of an object. Because of the existing move semantics for the types in question, this does not come at a performance penalty.
Former-commit-id: 5befdebd92
11 years ago
dehnert
2aa8d11101
Removed unnecessary option. Fixed performance tests.
Former-commit-id: 183c546953
11 years ago
dehnert
d8e85ec071
Removed guessing of initial scheduler as this was just an idea and not meant to be in master at this point.
Former-commit-id: 1b74c9936d
11 years ago
PBerger
11cc7fc6bc
Introduced a new Object called InternalOptionMemento to handle required settings for tests which auto-reset after the test is done
Refactored many constants to be of type ull where required
Edited all tests that used the set() function of the Settings to make use of the new InternalOptionMemento
Former-commit-id: a400a36f69
11 years ago
dehnert
0f4e51e646
Changed notation to query option slightly.
Former-commit-id: 993a053306
11 years ago
PBerger
79c40126f3
Fixed a bug in the SparseMatrix.h where the multi threaded implementation would crash sometimes
Added a new definition to CMakeLists.txt for MSVC as to undefine the MIN/MAX macros
Former-commit-id: 5a3d12e920
11 years ago