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
11 years ago
dehnert
b546118c98
Gurobi output now only gets printed to standard out and logfile if --debug has been set.
Former-commit-id: 4cd300ec5e
11 years ago
dehnert
5d76fd5ba0
Disabled model output to file.
Former-commit-id: be3eb00875
11 years ago
dehnert
014be3cb39
MinimalLabelSetGenerator can now handle multiple initial states properly.
Former-commit-id: 86f73a68a7
11 years ago
dehnert
6e41ee360d
Fixes to several problems with gcc.
Former-commit-id: f7908fdc6f
11 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
11 years ago
PBerger
cb1c3965ba
Removed a wrong and unnecessary validation function from ExplicitModelAdapter.cpp
Former-commit-id: 9f1aeaf27c
11 years ago
PBerger
4b3d4a7c11
Removed buggy logging in setup-routines
Former-commit-id: ba57953947
11 years ago
dehnert
f1c800f382
Minor fixes to MinimalLabelSetGenerator and AbstractModel.
Former-commit-id: 83ee7ae262
11 years ago
PBerger
3a38abec6f
Removed unnecessary names for unused variables in the ExplicitModelAdapter.cpp
Former-commit-id: bed4f234af
11 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
11 years ago
dehnert
8f3182b520
Working (and most importantly refactored) version of MinimalLabelSetGenerator.
Former-commit-id: 150b7d87e5
11 years ago
PBerger
e0ee4ea2fd
Implemented a method for generating a choiceLabeling based on the stateIds
Former-commit-id: d1eedecc22
11 years ago
PBerger
fad8371d7a
Added an Option for the Constants of the ExplicitModelAdapter
Implemented very basic validation of the input
Former-commit-id: f5f2340129
11 years ago
dehnert
3c22a669af
On my way of refactoring the minimal label set generator. Intermediate commit: does not compile, so be careful when pulling.
Former-commit-id: debe3fa1ff
11 years ago
dehnert
5ff550194c
Minimal label set generator now works for coin example, yay
Former-commit-id: 9ab8552d82
11 years ago
dehnert
735cd2013f
Further work on minimal label set generator. Intermediate commit.
Former-commit-id: 0f123ae3c4
11 years ago
dehnert
1a20ce7f33
A few additions to the minimal label set generator.
Former-commit-id: 7886f378ce
11 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
11 years ago
dehnert
816f12f2f6
Added global variables to string output of probabilistic program. Added number of choices to model information output of nondeterministic models.
Former-commit-id: 63f2b9da7a
11 years ago
dehnert
3aeb755e61
Bugfix: undefined constant expressions for the same constant now share a common structure internally that defines their value and definedness.
Former-commit-id: dd2fda5ab5
11 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
11 years ago
PBerger
47f7bf875d
Fixed static conversion bugs in the IR section
Former-commit-id: 6b63d4900e
11 years ago
dehnert
85e674266d
Added support for linking against Gurobi to CMakeLists.txt. Prepared work on the generator of minimal label sets.
Former-commit-id: a7a87edcfe
11 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
11 years ago
PBerger
f4c9fc0825
Fixed a dereferencing typo in GmmxxAdapter.h
Former-commit-id: 472dc3fa06
11 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
11 years ago
PBerger
158430418e
Replaced boost integer mask includes with cstdint
Reimplemented Gmm conversion with in place constructors
Former-commit-id: 003f582f9c
11 years ago
PBerger
a30f570c2a
Added logging to all Settings classes
Removed unnecessary instance variables in the Settings.h
Former-commit-id: 9a0261e82b
11 years ago
PBerger
58ff007654
Fixed the Settings structure
Fixed the standard settings to comply with the infrastructure
Former-commit-id: 9ab888c2df
11 years ago
PBerger
938959de56
Added a set() Method to the Settings.h for the Tests
Moved all standard options into a helper class/compilation unit as to reuse it in the Tests
Moved the MaxIteration set call in the tests
Former-commit-id: f436511107
11 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
11 years ago
PBerger
d5a9656cac
Removed OptionsAccumulator.h and merged it into Settings.h
Implemented some helper functions and convenience accessors
Former-commit-id: b2d91343af
11 years ago
PBerger
bde10b750e
Added my initial implementation of Settings
Former-commit-id: 5da4b7604f
11 years ago
dehnert
dc5ddca9d7
Fixed another bug in explicit model adapter.
Former-commit-id: 033684acad
11 years ago
dehnert
0473d1a757
Fixed a lot of issues with the IR and the explicit state space generator.
Former-commit-id: fe80aaaf0f
11 years ago
Lanchid
6af5ce4860
Another container for which gcc does not support emplace yet...
Former-commit-id: 3914bf9737
12 years ago
dehnert
973e51bacb
Beautified the code a bit.
Former-commit-id: d4b4a738c1
12 years ago
dehnert
b36b460a4e
Added some comments to scheduler guessing.
Former-commit-id: 6a256210a3
12 years ago
dehnert
d168b1848e
Made GMRES and LSCG solution methods work for linear equation solving. Some further work on scheduler guessing.
Former-commit-id: f6b538394a
12 years ago
dehnert
15542d46da
Changes:
* included small consensus example
* made backward-transition generation more beautiful and versatile
* included Dijkstra search for most probable paths
* included first rough scheduler-guessing (there's room for improvement though)
Former-commit-id: db795fa1bf
12 years ago
dehnert
5776b207c3
Changed to new cleaner iterator for matrix.
Former-commit-id: c35f075fb1
12 years ago
dehnert
36543de851
Started trying to implement a more clean iterator solution for sparse matrix.
Former-commit-id: 2173972b82
12 years ago
dehnert
663e1b0a8f
Fixed wrong model name in dot output.
Former-commit-id: 44e70120eb
12 years ago
dehnert
36f1306b4a
Now schedulers get computed correctly.
Former-commit-id: 3b986ffbf8
12 years ago
dehnert
7e74bfbff2
Fixed bug in creation of scheduler, but there is still one really obvious one. Added small MDP example.
Former-commit-id: e2b5aba6d5
12 years ago
Lanchid
89ba67ed47
Using the boost map as actionsToCommandIndexMap on Linux, as emplace()
is not implemented for the gcc standard library yet...
Former-commit-id: 434caed243
12 years ago
dehnert
c3cc58d43b
Revert to old starting point of value iteration. Tests run fine now.
Former-commit-id: db1b906b08
12 years ago
dehnert
7095f8e67f
Fixed a lot of issues introduced by refactoring.
Former-commit-id: c3a5177008
12 years ago
dehnert
abf6f85b63
Intermediate commit to switch workplace.
Former-commit-id: 11932e19d7
12 years ago