dehnert
1cc930f0e4
Added proper source grouping for properties directory. Fixed one performance tests. Started on SCC-based reachability model checker.
Former-commit-id: e48c163783
10 years ago
David_Korzeniewski
6dd69cca3c
Added interpolation methods to smt-solver interface.
Former-commit-id: a9b19cd0aa
10 years ago
dehnert
a0a8bf704a
Fixed some minor issues in the sparse matrix.
Former-commit-id: c7690b5a13
10 years ago
PBerger
2757dd31e2
Removed illegal typename keywords in SparseMatrix.cpp.
Refactored the constexpr in the AutoParser.
@CDehnert : SparseMatrix Lines 59 to 65 - that cant be right.
Former-commit-id: 21c458604c
10 years ago
dehnert
552b3eaab7
Fixed SCC performance tests.
Former-commit-id: a6b46e2fc5
10 years ago
dehnert
59dbc5a71e
Fixed tests to comply with new requirement for hint in tra-file (needs to be at the very beginning, no prior white spaces).
Former-commit-id: 60bfb720b8
10 years ago
dehnert
e02c8659fe
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Former-commit-id: 19edf14143
10 years ago
dehnert
418ce8b625
Fixed some problems related to the memory-mapped file.
Former-commit-id: 68225d8006
10 years ago
sjunges
e0f9bd7865
Merge branch 'refactorMainCpp'
Former-commit-id: 21cdb65d5e
10 years ago
sjunges
2ce2156c7a
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Former-commit-id: 3cbc9f3c2c
10 years ago
sjunges
daca9d5294
refactored main.cpp
Former-commit-id: a0648b4e1f
10 years ago
sjunges
b3810dc75b
factored out code parts from storm.cpp
Former-commit-id: 91cd8e52ad
10 years ago
dehnert
2c231a794d
SCC decomposition now correctly ignores zero-entries in the matrix.
Former-commit-id: 351c0ac6ad
10 years ago
sjunges
6fde42850d
fix for gcc 4.9
Former-commit-id: d6f8d87a63
10 years ago
dehnert
fff4e61fc3
Changed interface of matrix builder slightly to be able to also not force the resulting matrix to certain dimensions, but merely to reserve the desired space.
Former-commit-id: e36d05398e
10 years ago
dehnert
f767cfe844
Started to modify the matrix builder to be a bit smarter about preallocation.
Former-commit-id: 50be5c8af1
10 years ago
dehnert
ac420f13d0
Fixed some warnings in various places.
Former-commit-id: fbfbfc2bcb
10 years ago
dehnert
ab58103555
Started to pimp matrix. First step: added proper methods setColumn/setValue that operate on a matrix entry and removed the non-const versions of getColumn/getValue. Added a typedef for the index type in the matrix so that it becomes possible to have matrices with a different index type (e.g. 32-bit values).
Former-commit-id: 3cc0fdf9ee
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
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
40a8fdd6e4
Merge branch 'refactorFormulas' of https://sselab.de/lab9/private/git/storm into refactorFormulas
Former-commit-id: 9fc5309029
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
4614eccccb
Addendum to last commit: Forgot the files for the csl filter test.
Former-commit-id: cb38349e80
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
93a08538e3
Reverted debug change in test.
Former-commit-id: efeacaf595
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