sjunges
0d9ccde6af
merge with master
Former-commit-id: c30c43252e
10 years ago
dehnert
01cefbb2c0
Modified the multiplication of a sparse matrix with a dense vector to only use the parallel version if available and the number of nonzero entries exceeds a certain threshold.
Former-commit-id: 07957b2d29
10 years ago
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
7f7ddc06e1
Removed two erronous keywords.
Former-commit-id: ecc36e0b07
10 years ago
masawei
5a0059d110
Commented out the SMTMinimalCommandSetGeneraator, again.
Former-commit-id: 4e0427caaf
10 years ago
masawei
4f5b0b5949
Merge branch 'refactorFormulas'
Conflicts:
src/counterexamples/SMTMinimalCommandSetGenerator.h
src/storm.cpp
Former-commit-id: f65836b10d
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
b84ef7bebc
Merge branch 'master' into refactorFormulas
Conflicts:
src/counterexamples/MILPMinimalLabelSetGenerator.h
src/counterexamples/PathBasedSubsystemGenerator.h
src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h
src/parser/PrctlParser.cpp
src/storm.cpp
test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp
test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp
All conflicts resoved. Revision of src/modelchecker/csl/SparseMarkovAutomatonCslModelChecker.h pending.
Former-commit-id: 6bf9d05dba
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
10 years ago
masawei
7f15f358c1
Removed the FormulaCheckers.
Former-commit-id: 24910974c6
10 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
10 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
10 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
10 years ago
masawei
40a8fdd6e4
Merge branch 'refactorFormulas' of https://sselab.de/lab9/private/git/storm into refactorFormulas
Former-commit-id: 9fc5309029
10 years ago
masawei
0a2a759932
Ltl testng.
Former-commit-id: 57f486db59
10 years ago
PBerger
a49991484c
Fixed missing definitions for the current working directory.
Former-commit-id: cc99143526
10 years ago
PBerger
3bc31e927d
Added per-formula timing output.
This is basically a picky merge from my CUDA branch.
Former-commit-id: bb386486bb
10 years ago
PBerger
94b2d45e05
Fixed error reporting in AtomicPropositionLabelingParser.cpp and SparseStateRewardParser.cpp.
Former-commit-id: 155d96a54f
10 years ago
masawei
4614eccccb
Addendum to last commit: Forgot the files for the csl filter test.
Former-commit-id: cb38349e80
10 years ago
masawei
2687809591
Finished testing of Csl.
Former-commit-id: 91172a1b89
10 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
10 years ago
masawei
b7357c2cf9
Testing, noticed that vectors of pointers are not good. Changing that.
Former-commit-id: 460854c49c
10 years ago
PBerger
a39e9a821f
Fixed a type error in TBB implementation.
Former-commit-id: 680f43b36a
10 years ago
sjunges
4ba45efd1c
Merge branch 'parametricSystems' of https://sselab.de/lab9/private/git/storm into parametricSystems
Former-commit-id: b022b59c61
10 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
10 years ago
dehnert
f485974187
Fixed (asynch) leader election to comply with our grammar. Added LOG_DEBUG macro.
Former-commit-id: 7b22ecba8e
10 years ago
masawei
1c4d7b9ef9
Some more testing.
Former-commit-id: 3105a0bf3b
10 years ago
dehnert
577e48f8bf
Bugfix for the dimensions of some data of parsed Markov automata.
Former-commit-id: ab11be9ec4
10 years ago
dehnert
93a08538e3
Reverted debug change in test.
Former-commit-id: efeacaf595
10 years ago
dehnert
7c5603de3e
Improved performance of the expression parser a bit more.
Former-commit-id: 7a0ae116c9
10 years ago
dehnert
952747a9bc
Modified some rules in the expression parser such that less redundant parsing is done.
Former-commit-id: aa072c9f9b
10 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
10 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
430aa086be
Merge branch 'master' into SmtSolvers
Former-commit-id: f7a5827251
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
David_Korzeniewski
758fac5389
Merge branch 'master' into SmtSolvers
Former-commit-id: 57915f3aa9
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