dehnert
9ad12616e2
Renamed files in settings module a bit. Started on the pseudo-modular module-settings.
Former-commit-id: b3162aa86b
10 years ago
dehnert
96e1f8faf9
Renamed Settings class to SettingsManager.
Former-commit-id: 2b33f4c8d0
10 years ago
dehnert
9569426c86
Moved option registration to the settings class (so it's not deceentralized any longer). This enables to build storm as a library and on top of that build some exectuables, which saves a lot of compile time as soon as several targets have to be built or one switches between targets.
Former-commit-id: 69e0d526c7
10 years ago
dehnert
066a316778
Adapted erase to receive an iterator instead of a const_iterator to make it work under linux.
Former-commit-id: cae58b3f60
10 years ago
dehnert
95ee78ede2
First working version of SCC-based mc.
Former-commit-id: 57dc865344
10 years ago
dehnert
8f7c9d5c25
Adapted SCC-interface such that it can also be given a matrix instead of a model. More work on SCC-based mc.
Former-commit-id: 21d2482e4c
10 years ago
dehnert
610274dd3e
Further work on SCC-based mc.
Former-commit-id: a0a2cba226
10 years ago
dehnert
c2dc25a1eb
Started implementing the state elimination procedure.
Former-commit-id: c548a2ec06
10 years ago
dehnert
3c73441965
Merge branch 'master' into sccBasedMc
Former-commit-id: c38f3777c9
10 years ago
dehnert
b068499a24
Tuned SCC decomposition a bit.
Former-commit-id: 3f8c77f042
10 years ago
dehnert
8864efc980
Added method to determine reachable states. Further work on SCC-based mc.
Former-commit-id: 3a38eafeea
10 years ago
dehnert
77e2693ccc
Further work on SCC-based mc.
Former-commit-id: 4e5c1fb188
10 years ago
masawei
86fb5a3c49
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Former-commit-id: 62eaafecda
10 years ago
masawei
8f4653c98d
Some format changes in the formula and action classes.
- Indented the namespaces.
- Removed the file headers.
- Also added a free function overloading the stream output operator << for formula and filter classes.
|- Had to be a free function as the standard lib cannot be modified.
Former-commit-id: 59f21ecf3d
10 years ago
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
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