dehnert
d40573640f
Dropped our current Tarjan-implementation in favour of the path-based algorithm by Gabow (and others) as this seems to perform a lot better (at when comparing our implementations).
Former-commit-id: 5cfeb85193
10 years ago
dehnert
4f25312a6b
Adapted SMT-based counterexample generator such that it works with the new property classes.
Former-commit-id: 359a4c706f
10 years ago
masawei
5a0059d110
Commented out the SMTMinimalCommandSetGeneraator, again.
Former-commit-id: 4e0427caaf
10 years ago
masawei
52cfe9f02d
Fixed some compile errors.
- Added a missing inlude (boost/functional/hash.hpp) to SparseMatrix.h. I don't know how this could have been compiled without.
- Changed a return type in the stub section of the GurobiLpSolver to void. Not correctly overwrites the base class function.
- Went through the change history of the SparseMarkovAutomatonCslModelchecker.h to correctly integrate all changes made in this branch with the changes of the other branches.
Former-commit-id: 43ce12274b
10 years ago
masawei
d75e32b83e
Renames the folder formula to properties and the namespace property to properties.
Former-commit-id: 236ed22c7d
10 years ago
masawei
6b2b1e4d7b
Finished the documentation of the formulas.
- Also removed one superflous class (IOptimizingOperator).
- Killed all warnings concerning missing virtual destructor in the interfaced for the modelchecker.
- A whole lot of little things I can't quite remember.
Next up: Remerge
Former-commit-id: 28fedd036c
10 years ago
dehnert
cbf1301e47
Small bugfix.
Former-commit-id: 11d4a2474a
11 years ago
masawei
7f15f358c1
Removed the FormulaCheckers.
Former-commit-id: 24910974c6
11 years ago
masawei
532b0cf3ad
Added function to test if a formula is a probability bounded reachability formula, i.e. conforms to the pattern P[<,<=,>,>=]p ([phi U, E] psi) where phi, psi are propositional formulas (consisting only of And, Or, Not and AP).
- For that implemented function that checks if a formula is a propositional logic formula to all three logics.
- Added tests for the function.
- Added documentation for the function.
Former-commit-id: 3fcb84b990
11 years ago
masawei
27df78c2b0
Finished testing Ltl.
- Regrettably, the LtlFilterTest could not be done, since an Ltl modechecker would be needed for that. Which, we don't have.
|- So that is a TODO until such a modelchecker is implemented.
- This concludes the testing for the refactured formulas.
Next up: Documentation.
Former-commit-id: 2d731edcd9
11 years ago
PBerger
57882db84e
Fixed warnings about unused variables in PathBasedSubsystemGenerator and SMTMinimalCommandSetGenerator. Also some stuff with type conversions.
Fixed the missing include/definition for getcwd
Former-commit-id: 08f82f2ed2
11 years ago
masawei
0a2a759932
Ltl testng.
Former-commit-id: 57f486db59
11 years ago
PBerger
a49991484c
Fixed missing definitions for the current working directory.
Former-commit-id: cc99143526
11 years ago
PBerger
3bc31e927d
Added per-formula timing output.
This is basically a picky merge from my CUDA branch.
Former-commit-id: bb386486bb
11 years ago
PBerger
94b2d45e05
Fixed error reporting in AtomicPropositionLabelingParser.cpp and SparseStateRewardParser.cpp.
Former-commit-id: 155d96a54f
11 years ago
masawei
2687809591
Finished testing of Csl.
Former-commit-id: 91172a1b89
11 years ago
masawei
33386f4c5f
Changed the actions in the filters to be shared_ptr instead of raw pointers. This prevents memory leaks when a filter is destructed.
- Also handled nullptr actions.
|- They are checked for in the constructor as well as in the add method and filtered out. No segfaults do to nullptr actions anymore.
Former-commit-id: 84b3b2a978
11 years ago
masawei
b7357c2cf9
Testing, noticed that vectors of pointers are not good. Changing that.
Former-commit-id: 460854c49c
11 years ago
PBerger
a39e9a821f
Fixed a type error in TBB implementation.
Former-commit-id: 680f43b36a
11 years ago
dehnert
ff572c7f6f
Sped up PRISM parser by letting it skip the actual command definitions in the first run (because only gathering constants, variables and formulas is important in this particular run).
Former-commit-id: 0b25c73fa4
11 years ago
dehnert
f485974187
Fixed (asynch) leader election to comply with our grammar. Added LOG_DEBUG macro.
Former-commit-id: 7b22ecba8e
11 years ago
masawei
1c4d7b9ef9
Some more testing.
Former-commit-id: 3105a0bf3b
11 years ago
dehnert
577e48f8bf
Bugfix for the dimensions of some data of parsed Markov automata.
Former-commit-id: ab11be9ec4
11 years ago
dehnert
7c5603de3e
Improved performance of the expression parser a bit more.
Former-commit-id: 7a0ae116c9
11 years ago
dehnert
952747a9bc
Modified some rules in the expression parser such that less redundant parsing is done.
Former-commit-id: aa072c9f9b
11 years ago
dehnert
aecd0e3cb8
Made Storm compile again without Z3: guarded some header inclusions and function definitions/implementations. Also guarded the tests that require certain libraries (like Gurobi, glpk, Z3), so that tests do not fail any more when the libraries are not available.
Former-commit-id: 307036e25c
11 years ago
dehnert
5bb76eb12e
Bugfix for storm::utility::vector::reduceVector to correctly compute which choices were taken to achieve extremal values.
Former-commit-id: c200835cf5
11 years ago
dehnert
e2c2177dca
Adapted MaxSAT-based minimal command set generator to some recent changes to make it work again.
Former-commit-id: 8f8c33b920
11 years ago
masawei
2c59dd6f32
Finished unit tests for the actions.
Next up: Update the parser tests.
Former-commit-id: c0db7bd1d4
11 years ago
masawei
ee1ebdf91d
Removed the visitor from LTL and refactured the formulas to use shared pointer in stead of standart pointer.
Next up: Continue testing.
Former-commit-id: 0103895e13
11 years ago
dehnert
40c698af90
Some fixes to make new SMT framework compile with clang under Mac OS (includes fixes to some initializiation ordering warnings). Bugfix for PRISM parser to correctly handle formulas.
Former-commit-id: d513476066
11 years ago
David_Korzeniewski
3887cb57aa
Fix for temporaries and non const references
Former-commit-id: 4eadf6cdab
11 years ago
David_Korzeniewski
ee89065b07
Fixed type error on gcc and clang (int_fast64_t is not the same type as on msvc)
Former-commit-id: 06f4ba0f60
11 years ago
David_Korzeniewski
52d3d91060
Implemented Unsat Core/Assumtions & simple test
Former-commit-id: f79ee3a809
11 years ago
masawei
9fe246a98b
Renamed the folders containing the formulas to lowercase to adhere to the naming conventions and Started with testing.
-Tests for BoundAction done
Former-commit-id: d5698d3d53
11 years ago
dehnert
671797738a
Now the parameter that is set for dynamic reordering actually gets passed to CUDD.
Former-commit-id: 46676dc9d1
11 years ago
David_Korzeniewski
a815a6f425
Implemented allSat with z3 and test
Former-commit-id: 3795fc00c2
11 years ago
David_Korzeniewski
93c03fff3f
Fixed order of checks in Z3ExpressionAdapter, fixed missing override of isVariable in VariableExpression, removed unnecessary exception in Z3SmtSolver model generation
Former-commit-id: ca5f876655
11 years ago
masawei
df5bafc38b
Finished the implementation of the Cls and Ltl filters.
-Mostly copy and paste from the prctl version with some individual changes.
Next up: Testing.
Former-commit-id: 19a4f90255
11 years ago
masawei
a5e28fcf04
Added some filter actions.
- Also major cleanup of the filter.
- Implementation clompleted for pctl.
Next up: Wrap up the Csl and Ltl filter and then testing.
Former-commit-id: 8189f8462c
11 years ago
dehnert
caf96c04e0
Extended DD interface by methods to generate explicit row-grouped matrices from DDs.
Former-commit-id: 1945d7be6d
11 years ago
dehnert
8587f68eb1
Fixed toMatrix conversion using ODDs. The next step is to generate non-deterministic matrices, i.e., matrices with row groups.
Former-commit-id: e4a9c5f0ed
11 years ago
dehnert
084bb14acd
Bugfix for expression parser.
Former-commit-id: 2b03856c86
11 years ago
dehnert
236e7fa290
Another step towards generating explicit data structures from DDs using ODDs.
Former-commit-id: 5b7e3e8680
11 years ago
dehnert
f12ff82baf
Added getNodeCount for ODD and fixed a bug concerning boolean meta variables.
Former-commit-id: 79eb69226b
11 years ago
dehnert
5d53c6efa5
Added ODD-concept to easily convert between DD-based and explicit formats.
Former-commit-id: f2a2a002b7
11 years ago
dehnert
dd73387ed1
Add missing case.
Former-commit-id: b30aa3bc0d
11 years ago
dehnert
72cc5f2188
Added 'power' as a binary operator in expression classes and expression grammar.
Former-commit-id: c58321709e
11 years ago
dehnert
478f5ee38c
Started separating expression parsing from PRISM model parsing.
Former-commit-id: 84d1354f97
11 years ago
dehnert
28eed65a0d
Fixed a reference to a non-existant option.
Former-commit-id: 02020513cc
11 years ago