b26a731383
Added reward parsing:
* Transition-based rewards are parsed using the existing (Deterministic)SparseTransitionsParser.
* State-based rewards are parsed using a new SparseStateRewardParser that parses lines consisting of a state and an associated reward.
* The Dtmc class now stores the two reward models.
* The DtmcParser class now parses up to one transition-based and one state-based reward file. They may, however, be omitted in which case the respective reward model is set to null.
12 years ago
de85bfa80e
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
12 years ago
e4c1241b2b
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
12 years ago
37f6337fa5
using new iterator for checking matrix
SquareSparseMatrix now has a new iterator over elements in a row.
Dtmc uses this iterator to check the probability matrix.
12 years ago
cdc24b1456
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
12 years ago
48098b596d
Removed the parameter from const templates, as types can be stated
explicitly (see documentation)
12 years ago
a04bdd9b97
Fixed a few bugs.
12 years ago
4d4219991c
renaming sanity check, fix brackets
12 years ago
4b373b2146
fixing a warning and changing calls to std::string.compare() to ==
12 years ago
fa68492b55
removing distinction between different platform
using " \t\n\r" on all platforms now for lab parser
12 years ago
c8ec52f111
Merge branch 'refactoring'
Conflicts:
src/mrmc.cpp
12 years ago
1b973545bb
Fixes in probabilistic operators:
- Constructors and Destructors now work correctly
- Removed check function from ProbabilisticNoBoundsOperator class (and
documented why it does not have one)
Note: I temporarily removed the -Wall parameter from gcc calls, as line
194 of GmmxxDtmcPrctlModelChecker.h throws a warning.
12 years ago
ef03284369
Changed mrmc.cpp to use the new Dtmc parser instead of the separate
ones.
12 years ago
afb0373358
Added DtmcParser class that parses a whole DTMC, making use of the
labeling and transitions parser.
Removed the parseDtmc function from IoUtility, as it became obsolete
with the DtmcParser class, fitted test cases accordingly.
12 years ago
383f34e745
Function renaming
12 years ago
daa5cf297a
Changed type of parameter filename to std::string const & (was const
char*)
12 years ago
64784d4e92
Renamed LabParser to AtomicPropositionLabelingParser
12 years ago
3c741fae4a
Changed filename parameter for DeterministicSparseTransitionParser to a
const reference to an std::string, instead of char pointer
12 years ago
2da19207de
Removed check for valid probablilities, as we want to use the
DeterministicSparseTransitionParser for CTMCs (which have edges that are
not labeled with probabilities, but with weights) later on
12 years ago
b0b8c98f6b
Renamed TraParser to DeterministicSparseTransitionParser
12 years ago
89e38fed8f
Added temporary check() method to ProbabilisticNoBoundsOperator.
Added two check() functions to DtmcPrctlModelChecker that are to be called by the "outer world" that check a given formula and print the result the standard output.
Fixed bug in GmmxxDtmcPrctlModelChecker that prevented BiCGStab using ILU preconditioning from working
Refactored mrmc.cpp to remove larger code blocks from main().
Added option to specify logging file. If no file is set and the verbose option is not set either, logging is basically disabled by setting the logging level very high. This is a workaround for the fact that at least one log appender needs to be set in the logging framework, which would not be the case if both logging facilities (file and console) are disabled.
12 years ago
5cc8e8bb2d
modified sanity check to use internal data structures...
12 years ago
83e660ac3d
check is sums of each row is one (or zero for "imaginary" states)
12 years ago
470fa4c4b7
added sys/mman.h for linux target
12 years ago
0369207e9d
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
Conflicts:
src/storage/SquareSparseMatrix.h
12 years ago
a5d922c6a8
removed pointless return that produces an error (return value...)
12 years ago
2f05d035fe
Refactored all exceptions to use the macro generator to remove all redundant base code.
12 years ago
fe95c2225b
Added missing contructors to all exceptions.
12 years ago
01ea2c8427
Moved os specific includes into OsDetection.h
12 years ago
9e5b69b211
Further naming scheme enforcement.
12 years ago
96c7dd9a79
Added the (default) external build path /build to git ignore.
Added, fixed, refactored Include Guards in ALL Files, should be consistent now.
12 years ago
08f87d545c
Some more refactoring, renaming, adding #ifndef guards...
Fixed a warning in SquareSparseMatrix.h regarding a conversion from uint64 to uint
12 years ago
59408b2ab4
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
Conflicts:
src/parser/readLabFile.cpp
Additional refactoring, renamed tests.
12 years ago
64bf554cad
some more reformatting
12 years ago
6a720709a5
refactored opening braces in settings classes
12 years ago
94f46568d5
adding default value for trigger options
trigger options get the value of the trigger that was registered first as default value.
12 years ago
cce8391e44
Refactored everything to match naming scheme.
12 years ago
c7781f8137
Added option matrixlib to the generic options of the settings class to define a default value for the used backend. Related to ticket #29 .
12 years ago
18832101a4
Removed this-> in initializer list as clang++ does not like that.
12 years ago
1bd0df7076
Added option support to gmm++-based model checker. Removed junk code from mrmc.cpp.
12 years ago
50d9ce22de
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
12 years ago
0c3cfeef20
Updated project files of included resources.
12 years ago
95b000436b
Added a JacobiDecomposition container and conversion function. Added const where possible.
12 years ago
25ee8f906a
added a few words about the current state of the PRCTLParser
12 years ago
b9d1eb28f1
Removed superfluous operator.
12 years ago
d965595fbe
Evaluated given options in gmm++-based model checker.
12 years ago
e802942be2
fixing memory leaks. only log4cplus left...
12 years ago
331d3c7a11
fixing invalid read
iterators just don't survive an erase...
12 years ago
d34c39293e
Merge branch 'master' of https://sselab.de/lab9/private/git/MRMC
12 years ago
2a6228af71
Added some options to Gmmxx-Modelchecker. DO NOT PULL FOR THE TIME BEING AS THERE IS A PROBLEM WITH THE OPTIONS.
12 years ago
dehnert
gereon
Lanchid
PBerger