018e7ce056
some minor fixes.
Adapter now produces same result as prism for examples/dtmc/sync/sync.pm except order of nodes.
13 years ago
17d57e742a
Added code for labeled transitions.
New Adapter is basically finished, but not really tested ;-)
13 years ago
3464ef20c5
next chunk of code for new ExplicitModelAdapter.
now we have routines to create a result matrix from the intermediate representation, one for DTMCs and one for MDPs.
13 years ago
6d0d7e21c5
First chunk of code for new ExplicitModelAdapter.
The new adapter will generate an intermediate datastructure that holds all transitions to be inserted.
This will combine the two phases (computing the state space and actually generating the matrix) and can also be used for dtmc and mdp models.
This datastructure is only a list of maps for each state. Each map represents a nondeterministic choice and maps target node ids to their probability.
13 years ago
d477d752b1
Updated the Jacobi Solver to make use of the new Adapters, refactored the Matrix conversion.
Residuum Calculcation still requires decision by CDehnert
13 years ago
22ce042472
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
13 years ago
5cdfba685e
Added resources for Usage of Intels Thread Building Blocks
Implemented multithreading using TBB inside of GMM for usage in Sparse Matrix Multiplication against Dense Vectors
Usage: #define GMM_USE_TBB to enable TBB, additionally define GMM_USE_TBB_FOR_INNER to enable multithreading for EACH row (only feasible of the number of NNZ per Row is large - as in near dense)
13 years ago
2365b7e6ea
Updated gitignore file with a few more useful extensions
13 years ago
f1c379bbe3
Moved model checking functionality for MDPs for general superclass such that specialized model checkers only need to implement certain operations. Fixed tests.
13 years ago
34b85b956e
Moved model checking of DTMCs to superclass. Now, each DTMC model checker only needs to implement matrix-vector multiplication and linear equation solving to be able to fully model check DTMCs. Added subset/disjoint functionality to bit vector. Changed tests for MDP and DTMC model checking a bit.
13 years ago
4bcb26ab96
Included subset-test in bitvector.
13 years ago
5e3a8a1232
Fixed wrong check for submatrix property of reward matrices.
13 years ago
a6ae3d713a
Fixed test for nondeterministic model parser.
13 years ago
c7f58ed5f5
Modified parsers such that the reward matrices are of the same size as the transition matrices.
13 years ago
abae304719
Included tests for model checkers in test suite.
13 years ago
74ad17bc90
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
13 years ago
cf772688f0
added setter for options in Settings class.
13 years ago
b7d4d974ec
Added a lot of test checking routines to main file.
13 years ago
5b49307eaf
Added PRISM files for all of our examples. Added missing reward models. Added result files that indicate the results of PRISM on our examples.
13 years ago
aacd8b1fa2
Merge branch 'prismparser' of https://sselab.de/lab9/private/git/storm into prismparser
+ tiny fixes
Conflicts:
src/parser/PrismParser.cpp
13 years ago
ba49792d29
Perform two runs in PrismParser.
First run collects all variables, second run uses the declared variables.
13 years ago
38cec01978
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Conflicts:
src/parser/NondeterministicSparseTransitionParser.cpp
13 years ago
06d78967df
Fixed MDP Parser, removed parsing of STATES/TRANSITIONS, see #10
Refactored the Sparse Adapters, see #17
13 years ago
fb7b910f51
Reverted PRISM example to original reward formulation, because we can now deal with transition rewards on MDPs.
13 years ago
3ab71cc08a
Added proper treatment of transition based rewards.
13 years ago
7b259120b7
Marked submatrix check in DTMC and sparse matrix as faulty. Needs to be fixed.
13 years ago
d38e7eeeb8
Implemented new utility functions and improved existing ones.
13 years ago
69acbdef63
Fixed a few things in the parsers and implemented proper treatment of reward files by these parsers.
13 years ago
2a044d9a7c
Changed example files to comply with our current format, i.e., removed header.
13 years ago
bc4eb661ba
Fixed some memory leaks. Fixed bug in vector utility. Fixed bug in sparse matrix printing. Fixed bug in DTMC model checker (computing reachability rewards). Included full reward model checking for MDPs.
13 years ago
cbf4a2ff3b
Small update to model checking reward formulae over MDPs.
13 years ago
e99909034c
Added some more test formula for two dice example in main file.
13 years ago
0d7889932c
Fixed bug that gave wrong vector when parsing the state rewards.
13 years ago
40f7ccac52
Implemented model checking of instantaneous reward formulae over MDPs in Gmmxx model checker.
13 years ago
5ef40c3033
Added explicit state rewards file for two dice model.
13 years ago
c0468675c7
Fixed parser to correctly ignore the file header.
13 years ago
acc368d49a
Changed two dice example to not include the file header any more.
13 years ago
351421e9e7
Corrected typo.
13 years ago
b2c0cfc57c
Added a conversion routine GmmXX -> Storm Sparse Matrix
Added Jacobi to possible LE Solvers in the GMM Model Checker
13 years ago
4fe071033b
Removed std:: from uint type specifier (illegal in VS2012)
Removed parsing of STATES and TRANSITIONS from Parsers
13 years ago
22d8ec76bc
fixed position indication in PrismParser in case of an error.
13 years ago
8f4f39d510
closed last memory leak...
13 years ago
34ca097eb3
fixed another more memory leak. One still missing...
13 years ago
58cf018371
Implemented synchronization in ExplicitModelChecker::buildMatrix().
This seems to produce the correct number of states and produces no valgrind errors. :-)
13 years ago
c33d319ac3
some minor fixes, now with less memory errors :)
13 years ago
05cc90cece
Now also creating a std::set before inserting stuff...
13 years ago
490f037259
Kind of undoing the previous commit.
gcc can only link, if -lobj is the first cudd lib to be linked...
Now, all the object files can be removed from libobj.a
13 years ago
4df73785ca
Modified cudd's libobj Makefile to work for me.
First: added CXXFLAGS line for g++
Second: added all necessary object files to libobj.a
13 years ago
42693bf0f2
Fixed wrong includes of cuddObj.hh in expression classes. Added missing files of cudd.
13 years ago
270c3125b5
Adding new simple example pm file.
sync.pm contains a very simple model that uses the synchronization feature of prism.
13 years ago
gereon
PBerger
dehnert