masawei
3ac03b9b5b
Merge branch 'refactureParsers' of https://sselab.de/lab9/private/git/storm into refactureParsers
Former-commit-id: d7fd28ab06
11 years ago
masawei
15d13bc06d
Refactored the AutoParser.
- Devided the AutoParser.h into .h and .cpp
- The AutoParser now is a stateless class
|- This resulted in changes to the interface between the parsers and the rest of the project.
|- The main() now directly acquires a shared_ptr to an AbstractModel from the call of the AutoParser and keeps ownership of it.
|- Additionally, the division into .h and .cpp lead to a move of includes from the header to the source. This caused several tests to need some model header to be included.
|- Tests are still showing green (except those needing Gurobi, which I do not have).
Next up: Parser.h/.cpp, then comments and making things look nice.)
Former-commit-id: f59b7405e5
11 years ago
masawei
46e783c981
Refactored AtomicPropositionLabelingParser.
- Not much to do here.
- Mostly comment corrections and code restructuring.
Next up: Parser.h/.cpp and the AutoParser.
Former-commit-id: 22d67dadb8
11 years ago
masawei
c279c693e5
Refactored NondeterministicModelParser.h/.cpp
-Mostly restruturing and tidying up.
Next up: Refatoring AtomicPropositionLabelingParser.h/.cpp
Former-commit-id: c26abad850
11 years ago
masawei
cc71a002f4
Refactored NondeterministicSparseTransitionParser.h/.cpp.
-Changed structure to conform to common parser structure: static class with two passes and structs to handle value passing.
-Killed all warnings (signed unsigned interger compare)
-Made parser more flexible: Is now able to ignore arbitrarily many columns after the value column (instead of only one).
-Threw out a number of unnecessary includes.
-more...
Next up: Refactor NondeterministicModelParser.h/.cpp
Former-commit-id: fd2fdb7fdf
11 years ago
masawei
8adee3629b
Removed duplicated code in DeterministicSparseTransitionParser while still keeping it readable and the interface intact.
Next up: Refactor the Nondeterministic*Parser.
Former-commit-id: 108eea60a0
11 years ago
masawei
4245b3c4e3
Changed parsers to be compilable again.
- Mostly effects of the SparseMatrix redesign.
- Plus some missing includes.
Former-commit-id: 11c5bc9970
11 years ago
masawei
8e5847ae19
Merge branch 'master' into refactureParsers
Conflicts:
src/models/MarkovAutomaton.h
src/parser/DeterministicModelParser.cpp
src/parser/DeterministicSparseTransitionParser.cpp
src/parser/MarkovAutomatonParser.cpp
src/parser/MarkovAutomatonSparseTransitionParser.cpp
src/parser/MarkovAutomatonSparseTransitionParser.h
test/functional/parser/ReadTraFileTest.cpp
TODO: Investigate MatrixBuilder and use it appropriately.
Former-commit-id: 3660c948e2
11 years ago
masawei
1f71bb5240
Refactored the DeterministicModelParser.
Former-commit-id: 7227d25499
11 years ago
dehnert
310a840ad5
Removed move-version of translation from SparseMatrix to gmm++, because moving is not really possible considering the different types.
Former-commit-id: 909300951e
11 years ago
dehnert
8cdf128202
Fixed some performane tests to work with the relative convergence criterion as this is now the default.
Former-commit-id: 7766351c18
11 years ago
dehnert
f946121b95
Fixed an incorrect type issue in the GmmxxAdapter.
Former-commit-id: 311a970fac
11 years ago
dehnert
42708a6d21
Added utility header for all parts that use std::swap.
Former-commit-id: 55a2f56440
11 years ago
dehnert
ef5eb19e9c
Corrected test formulation in case StoRM was built without support for a given LP solver.
Former-commit-id: 7ae692f274
11 years ago
dehnert
36fb44e206
Added functional tests for nondeterministic linear equation solvers. Added functional tests for LPs in addition to the existing MILP tests.
Former-commit-id: 8c0fa08f2d
11 years ago
dehnert
514aace4fd
Added function tests for both glpk- and Gurobi-based LP solver implementations. Found and fixed some bugs while doing this.
Former-commit-id: 99e58097f7
11 years ago
dehnert
c5985be437
Minor fixes for GlpkLpSolver.
Former-commit-id: 07595da7f3
11 years ago
dehnert
8ebd924ca6
Further work on refactoring solvers: cleaned LP solver interface a bit and adapted glpk- and Gurobi-based implementations of the interface.
Former-commit-id: 25b7a22bcc
11 years ago
dehnert
588a4b60b6
Refactored linear equation solvers and nondeterministic linear equation solvers. Added functional tests for both.
Former-commit-id: 0abb11828a
11 years ago
masawei
3598b7195e
Refactored the DeterministicSparseTransitionParser.
Former-commit-id: 9012aadd9d
11 years ago
dehnert
ae270cc917
Added two more example files that form a Markov automaton.
Former-commit-id: fa605690cf
11 years ago
dehnert
79730379e4
Started refactoring the linear equation system solvers.
Former-commit-id: 72d647fd42
11 years ago
dehnert
ee0026e0e6
Fixed minor bug in Markov automata time-bounded reachability.
Former-commit-id: 6454223cd3
11 years ago
dehnert
efb244a447
Added functional tests for scheduler classes.
Former-commit-id: d7f7da5ab0
11 years ago
dehnert
f79329bd9d
Fixed SCC decomposition. Added functional tests for SCC decomposition.
Former-commit-id: 25a7805fcb
11 years ago
dehnert
e80bb0caa5
Added functional tests for MEC decomposition.
Former-commit-id: 66b1265ebb
11 years ago
dehnert
f32853b6aa
Beautified remaining storage classes a bit.
Former-commit-id: 93f272727f
11 years ago
dehnert
35d16a1191
Replaced VectorSet bei boost::container::flat_set, which does essentially the same. Fixed a bug in sparse matrix creation.
Former-commit-id: cb632bcfd4
11 years ago
dehnert
f684ce7799
Removed obsolete constructors of sparse matrix class as the new matrix builder is supposed to be used anyway. Fixed some minor issues.
Former-commit-id: ee8a7cc440
11 years ago
dehnert
5e12a65d67
Adapted performance-critical iterations in graph utility to the iterator formulation with less overhead.
Former-commit-id: 44bf732bb4
11 years ago
dehnert
41cb1a8227
Merge branch 'master' into storageRefactoring
Former-commit-id: 7ae25e7ab2
11 years ago
dehnert
f2670883a8
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Former-commit-id: 6637a6fac4
11 years ago
dehnert
72531bcebb
Added proper TBB multi-threading to all operation relevant to model checking MDPs.
Former-commit-id: dcb4bde1d3
11 years ago
dehnert
d723272cc1
Added some performance tests for matrix-vector multiplication.
Former-commit-id: 521dbf788d
11 years ago
dehnert
cdc369b96a
Temporarily removed the detection of the repository version of TBB from CMakeLists.txt. Corrected TBB sparse matrix-vector multiplication. Added TBB parallel vector addition.
Former-commit-id: f90ae764c8
11 years ago
dehnert
81cf0e2b22
Added SparseMatrixBuilder class that actually builds the matrices. A call to build() will then generate the matrix. This eliminates superfluous checks in the matrix that slowed down performance.
Former-commit-id: af5d946fb8
11 years ago
dehnert
cf2b84b281
Further work on iterators for sparse matrix.
Former-commit-id: 8e78262161
11 years ago
dehnert
ab5b5be1ac
First step towards pair-based column and value storage in sparse matrix.
Former-commit-id: c0ad97be8f
11 years ago
David_Korzeniewski
91125c3c6d
Fixed build errors on Windows
Former-commit-id: 6ddc16cd5a
11 years ago
dehnert
e08b61b9f7
Added functional and performance tests for sparse matrix.
Former-commit-id: dd9abe1826
11 years ago
dehnert
97fb2f9750
All tests working with (partially) new sparse matrix implementation/interface.
Former-commit-id: 0272dd3524
11 years ago
masawei
f8566e9dc2
A thousand things.
- More tests.
- Changed SparseStateRewardParser to a static class
- Added comments here and there
- Some reformatting.
- Fixed some warnings.
- Eliminated some unnecessary includes.
- ...
Former-commit-id: efe1c96fee
11 years ago
masawei
9ce47989ed
The MA transition parser is now able to handle arbitrary labels.
Former-commit-id: 9643f41141
11 years ago
dehnert
a271e5ce63
Working towards making every (remaining) test work
Former-commit-id: e4560e07f2
11 years ago
dehnert
a26f63be30
Finished reworking the sparse matrix implementation. Adapted all other classes to the (partially) new API of the matrix.
Former-commit-id: 2c3b5a5bc3
11 years ago
dehnert
ef041982b5
Further work on sparse matrix implementation.
Former-commit-id: df4eb9c476
11 years ago
dehnert
4376708a46
Further maintenance work on sparse matrix implementation.
Former-commit-id: 56885d90bf
11 years ago
dehnert
8a47d03cf7
Started to rework the interface of the sparse matrix class.
Former-commit-id: 6ae2699da6
11 years ago
dehnert
84bd5f3b40
Renamed ConstTemplates to constants. Removed all calls to constGetZero, constGetOne and constGetInfinity by the new names. Created performance test for bit vector iteration.
Former-commit-id: 6d90ec961e
11 years ago
dehnert
d5cadc0f4b
Finalized interface of bit vector. Added unit tests for all methods of the bit vector.
Former-commit-id: 6c7834ed20
11 years ago