PBerger
c242dcbd97
Refactored CMakeLists.txt for better editing and overview
Refactored all Defines for Gurobi, TBB, etc into the storm-config file
Fixed a missing cast int SymbolicModelAdapter.h
Fixed changed iterator structures in SparseMatrix.h
Fixed bugs in CuddUtility.cpp where a 64bit shift was executed on a 32bit literal (1 should be 1ull)
Fixed a Type Error in graph.h
Former-commit-id: 797b4da2eb
12 years ago
dehnert
6e41ee360d
Fixes to several problems with gcc.
Former-commit-id: f7908fdc6f
12 years ago
dehnert
1934bdd801
Disabled MinimalLabelSetGenerator test code in storm.cpp and fixed minor issue in ExplicitModelAdapter that treated constant strings incorrectly.
Former-commit-id: 11a31be820
12 years ago
PBerger
cb1c3965ba
Removed a wrong and unnecessary validation function from ExplicitModelAdapter.cpp
Former-commit-id: 9f1aeaf27c
12 years ago
PBerger
3a38abec6f
Removed unnecessary names for unused variables in the ExplicitModelAdapter.cpp
Former-commit-id: bed4f234af
12 years ago
PBerger
f7a7ea8383
Fixed the StringValidator for the constants option
Fixed a bug in the MinimalLabelSetGenerator.h where a non static variable was initialized
Added the new constants option in storm.cpp
Former-commit-id: e73e69b1ce
12 years ago
PBerger
fad8371d7a
Added an Option for the Constants of the ExplicitModelAdapter
Implemented very basic validation of the input
Former-commit-id: f5f2340129
12 years ago
dehnert
84e7061a6d
Undefined constants are now undefined again after the explicit adapter has created the model (using specific constant values).
Former-commit-id: 96381b7d37
12 years ago
dehnert
12a92fc6ee
Several fixes and additions to IR. Modifications to CMakeLists.txt of log4cplus to enable proper compilation under Mac OS. Fixes to coin2.nm. Added global variables to grammar and IR. Established basis for defining undefined constants of the model. Started to write MinimalLabelSetGenerator.
Former-commit-id: b65bb063fa
12 years ago
dehnert
947581dd25
Refactored and fixed bugs in explicit model adapter. Added support for labeling of choices of a model. The explicit model adapter uses that functionality to label each choice with the involved PRISM commands.
Former-commit-id: 818431d6e9
12 years ago
PBerger
f4c9fc0825
Fixed a dereferencing typo in GmmxxAdapter.h
Former-commit-id: 472dc3fa06
12 years ago
PBerger
edeedd2bed
Added ConversionHelper.h to single out the needed no-strict-aliasing target
Replaced a few "auto" variables as GCC4.7 fails to infer the correct type
Former-commit-id: 09a0c8dac9
12 years ago
PBerger
158430418e
Replaced boost integer mask includes with cstdint
Reimplemented Gmm conversion with in place constructors
Former-commit-id: 003f582f9c
12 years ago
PBerger
e69c9f1962
Added all options from StoRM
Rewrote all calls to the Settings instance with the new Syntax
Implemented new ArgumentValidators.h
Former-commit-id: b4ab63f8f2
12 years ago
dehnert
dc5ddca9d7
Fixed another bug in explicit model adapter.
Former-commit-id: 033684acad
12 years ago
dehnert
0473d1a757
Fixed a lot of issues with the IR and the explicit state space generator.
Former-commit-id: fe80aaaf0f
12 years ago
PBerger
eae169727a
Fixed a critical bug in the GmmxxAdapter.h
Former-commit-id: 062f330dbf
12 years ago
PBerger
01fd3c18e3
Added move constructors, added move-calls where fitting.
Former-commit-id: e73336c816
12 years ago
PBerger
6ef6b139c9
Fixed a missing control path in the ExplicitModelAdapter.cpp
Former-commit-id: db0dd838aa
12 years ago
PBerger
b978a4d311
Added more move constructors.
Former-commit-id: 9770365fbb
12 years ago
dehnert
4dadedf39d
Added methods to retrieve module index by variable name from IR. This fixes an issue in the symbolic adapter.
12 years ago
dehnert
7b8b1ebd4f
Further refactoring of IR classes.
12 years ago
Lanchid
4b68cb7bbf
Removed all references to LTL2DStar in Master branch
12 years ago
Lanchid
1e5de29eec
Conversion adapter to create LTL2DStar formulas out of "ours"
12 years ago
Lanchid
ec91dcbe2e
Merge branch master into LTLParser
12 years ago
gereon
cd9e2ba549
Some minor cleanups, added lot of documentation in prismparser
12 years ago
gereon
cb14f2e771
Made choiceIndices work in ExplicitModelAdapter, added code to somehow use --symbolic (parse model, show model information)
12 years ago
dehnert
6920e1ccdd
Added static_casts and changed some types to signed instead of unsigned to eliminate some warnings of MSVC.
12 years ago
PBerger
d3c80dca16
Updated CMakeLists.txt
- Added more sub-folders in the source-structure
- Added an option for MSVC to use /bigobj with the Compiler as PrismParser.cpp bloats the object instance count
- Edited CUDD Link Targets for MSVC
Edited SymbolicModelAdapter.h, added an alternative implementation for log2 (NOT part of C90, not of Cxx!)
Edited Program.cpp, promoted vars from int to uint to conquer warnings related to loss of precision
Likewise in DeterministicSparseTransitionParser.cpp, IntegerConstantExpression.h
Edited storm.cpp, reimplemented Usage-Query for non-Unix platforms.
Edited CuddUtility.h, added an include for int Type definitions as they do not fall from the sky
Edited ErrorHandling.h. reimplemented ErrorHandling for non-Unix platforms. Backtraces can not yet be provided.
12 years ago
gereon
aafdbf7671
Fixed errors due to merging.
12 years ago
gereon
fad8290844
Renamed WrongFileFormatException to WrongFormatException
12 years ago
gereon
5495456991
Added new log level "trace"
Fixed bug in ExplicitModelAdapter
12 years ago
gereon
8cdb6d5394
Put initial state in stateToIndexMap
12 years ago
gereon
21e3740867
Fixed bug in computation of number of choices in case of deadlocks.
12 years ago
gereon
860a775c18
Actually skip modules that do not have commands with current label.
12 years ago
gereon
b7a1e90579
Variables were counted in two places (VariableState and ExplicitAdapter).
Now, they got mixed up... this is fixed now.
12 years ago
gereon
ac313cb997
Removed debug output, fixed DoubleExpressionGrammar
12 years ago
gereon
014ecd8597
Fixed some glitches, producing meaningful error if sum of probabilities for a command is not one
12 years ago
gereon
dffe274f64
Fixed error in MDP builder: swapped number of columns and rows.
12 years ago
gereon
9613d099bb
Removed shared_ptr for module, program and rewardmodel objects.
12 years ago
gereon
1878962dea
Fixed another nullptr, removed shared_ptr for Update and Command objects.
12 years ago
gereon
d03f8eeb9d
Added checks, if we actually have a model before accessing it...
12 years ago
gereon
152bcd2f20
Porting Program datastructures to use shared_ptr (at least for the moment...)
some more cleanups
12 years ago
gereon
e4129c37d9
fixed two bugs in ExplicitModelAdapter.
12 years ago
gereon
5c25116a24
First version of ExplicitModelAdapter that supports transition rewards.
12 years ago
gereon
75ce91082a
Forgot to commit actual cpp file...
12 years ago
gereon
5f64fd168b
Cleaned up structure of ExplicitModelAdapter.
- added cpp file
- returns complete models now (missing transition rewards...)
12 years ago
gereon
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
12 years ago
gereon
84993d24f8
Add documentation for ExplicitModelAdapter.
12 years ago
gereon
dfd601e126
fixed memory leak in addLabeledTransition and removed now obsolete functions.
12 years ago