5f64fd168b
Cleaned up structure of ExplicitModelAdapter.
- added cpp file
- returns complete models now (missing transition rewards...)
13 years ago
f52d4eb7a8
Added new option --debug.
13 years ago
fd30e8ca25
Cleaned up handling of --verbose, proposing correct use of log levels from now on...
FATAL_LOG_LEVEL: Use, if we are going to crash.
ERROR_LOG_LEVEL: Use, if there is no reasonable way to continue.
WARN_LOG_LEVEL: Use, if we got something the average user should read.
INFO_LOG_LEVEL: Use, if this might in some cases be of interest.
DEBUG_LOG_LEVEL: Use, if this should usually not be relevant to a user.
TRACE_LOG_LEVEL: Use only during development.
There are three levels of verbosity:
- default: WARN and above
- verbose: INFO and above
- debug: DEBUG and above
13 years ago
5976c9e81d
More work for ExplicitModelAdapter
* Removed templates from various functions, as we can only produce double models anyway.
* Added methods to compute state rewards and state labelings
* Added toModel() routine
13 years ago
2005eb7e73
Added getter routines, so we can retrieve the reward models
13 years ago
84993d24f8
Add documentation for ExplicitModelAdapter.
13 years ago
dfd601e126
fixed memory leak in addLabeledTransition and removed now obsolete functions.
13 years ago
e711d16ebf
Changed default initial value for BooleanVariable.
Was false (suggesting that no initial value would be equivalent to specifying false), is nullptr now.
13 years ago
52225ecf9c
Fixes to buildInitialStates.
13 years ago
772c03c070
Added routine to create all initial states.
Variables that have no explicit initial value will cause initial state for all possible values.
13 years ago
752dda4252
fixing error with difference operator in freeIdentifier
13 years ago
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
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
351421e9e7
Corrected typo.
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
de268ec3e8
Forgot to remove a *...
13 years ago
e69c9db266
Implemented synchronization within computeReachableStateSpace.
Added new helper routines:
* getActiveCommandsByAction() retrieves commands that are active (i.e. guard is true) for some action.
* applyUpdate() copies a given state and updates it with a given update.
Added state expansion for synchronized commands.
Made former loop only consider unsynchronized commands.
13 years ago
845af3f12e
Added actionMap to Program, added set of actions to Module and Program.
13 years ago
00ce70d411
Added actionsToCommandIndexMap, initialization and getter.
This map maps an action name to the set of Commands labelled with this action name.
13 years ago
03ca1e880d
Renamed commandName to actionName, added getter for actionName
13 years ago
18b6e812a7
Added #include <memory>, as std::shared_ptr is used within this file
13 years ago
9a1a7ae03c
Merge.
13 years ago
db01eb92d9
Splitted explicit model adapter into several logical functions.
13 years ago
34aff4cbd9
Added constructor for ExplicitModelAdapter class.
13 years ago
777aa3a914
Intermediate commit to switch workplace.
13 years ago
ff0f2197b2
Merge with master.
13 years ago
6fb56748a6
Bugfix for correctly counting the number of values the parser inserts.
13 years ago
726569d5f1
Fixed bug in parser that inserted 0-entries on the diagonal at the wrong places. Enabled link-time-optimizations for Release-Build when using clang. Fixed bug in base exception: what() returned a pointer to a char array belonging to a local variable, which got deallocated and thus invalidates the char array content.
13 years ago
9a9cd968d9
Added a test to verify the RowSum Function in the Sparse Matrix.
Added an option to the settings for auto-fixing missing no-selfloop states. Kind of a super-option above fix-nodeadlocks, perhaps some Cleanup later on.
Modified tra Files to comply with formats...
13 years ago
1edd306032
Silenced warning of clang: Changed NULL to nullptr as this should be used in C++11.
13 years ago
0a6a0b9fd3
Eliminated warning of clang by introducing proper getter.
13 years ago
c47b559986
Fixed minor bugs for Jacobi decomposition.
13 years ago
5f57cbb12a
Now able to build the BDD for the die example, including the reachability analysis! Booyah
13 years ago
4d813999e3
Backup commit. On my way of buidling appropriate BDDs.
13 years ago
c4af78b859
Added singleton utility class for CUDD-based things. Added some first methods to expression classes to generate ADDs, but this should be moved to a separate class implementing the expression visitor pattern.
13 years ago
5b0af74fa6
Integrated a few more functions to CUDD which are necessary (PRISM adds them as well).
13 years ago
278b425a35
Switched to die example.
13 years ago
gereon
dehnert
PBerger