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
dehnert
0473d1a757
Fixed a lot of issues with the IR and the explicit state space generator.
Former-commit-id: fe80aaaf0f
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
PBerger
68c27f99ef
Mass-added Keyword "override"
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
dd317bf6a4
Fixed issues with PRISM parser.
12 years ago
dehnert
9505f553dd
Added copy-constructors for all IR classes. TODO: make tests run again...
12 years ago
dehnert
23f25beb27
More fixes. Still TODO: copy constructors for IR classes.
12 years ago
dehnert
a0ee0b46c7
Fixed minor bug.
12 years ago
dehnert
7b8b1ebd4f
Further refactoring of IR classes.
12 years ago
dehnert
e30c386f23
On my way of splitting header/source files in IR to make forward-declaration easy.
12 years ago
dehnert
8abc703f6a
Further refactoring of IR and PRISM parser.
12 years ago
dehnert
82430ca12d
Fixed dummy returns in VariableState.cpp.
12 years ago
dehnert
22ddf9c5be
On my way of cleaning up Gereon's mess. :P
12 years ago
dehnert
ab8585656c
Started to refactor PRISM parser.
12 years ago
Lanchid
ec91dcbe2e
Merge branch master into LTLParser
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
5495456991
Added new log level "trace"
Fixed bug in ExplicitModelAdapter
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
dfd4df2884
Removing debug output.
12 years ago
gereon
3ff9514f7b
Make clone() work for variables without initial value.
12 years ago
gereon
ac86932785
Fixed renaming: Command names were not considered.
12 years ago
gereon
4222130524
Fixed a few more bugs in clone() of various Expression classes and some in the module renaming.
12 years ago
gereon
c3cfc5404c
Somewhat fixed weird issue during module renaming.
The "fix" is very weird (see VariableState.cpp:55 and following) and still seems to lead to a segfault upon program termination...
12 years ago
gereon
ac313cb997
Removed debug output, fixed DoubleExpressionGrammar
12 years ago
gereon
766a92db3a
Fixed error in *Literal::clone()
12 years ago
gereon
a9edf2aa8c
Removed some debug output.
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
3c1cf4819c
Fixed a few other issues. Module renaming seems to work now!
(However, there is still a segfault at some later point...)
12 years ago
gereon
152bcd2f20
Porting Program datastructures to use shared_ptr (at least for the moment...)
some more cleanups
12 years ago
gereon
840a9b6e07
Somewhat works now. Still has at least one bug and segfaults afterwards :-)
12 years ago
gereon
e55fca3836
Implemented module renaming.
This includes clone() routines (that accept the renaming information) for all ir::expressions classes, additional constructors for all ir classes and additional rules in PrismParser.
This is the first version that has the chance to work and actually compiles. (Insert some swearing here...)
Testing is to be done, as this will most probably not work yet.
12 years ago
gereon
d9e833680a
Added convenience methods RewardModel::hasStateRewards() and RewardModel::hasTransitionRewards()
12 years ago
gereon
7dc5324a65
Program returns empty RewardModel and emits error, if invalid model is given.
12 years ago
gereon
2005eb7e73
Added getter routines, so we can retrieve the reward models
12 years ago
gereon
e711d16ebf
Changed default initial value for BooleanVariable.
Was false (suggesting that no initial value would be equivalent to specifying false), is nullptr now.
12 years ago
gereon
05cc90cece
Now also creating a std::set before inserting stuff...
12 years ago
dehnert
42693bf0f2
Fixed wrong includes of cuddObj.hh in expression classes. Added missing files of cudd.
12 years ago
gereon
845af3f12e
Added actionMap to Program, added set of actions to Module and Program.
12 years ago
gereon
00ce70d411
Added actionsToCommandIndexMap, initialization and getter.
This map maps an action name to the set of Commands labelled with this action name.
12 years ago
gereon
03ca1e880d
Renamed commandName to actionName, added getter for actionName
12 years ago
gereon
18b6e812a7
Added #include <memory>, as std::shared_ptr is used within this file
12 years ago
dehnert
db01eb92d9
Splitted explicit model adapter into several logical functions.
12 years ago
dehnert
777aa3a914
Intermediate commit to switch workplace.
12 years ago
dehnert
0a6a0b9fd3
Eliminated warning of clang by introducing proper getter.
12 years ago
dehnert
4d813999e3
Backup commit. On my way of buidling appropriate BDDs.
12 years ago
dehnert
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.
12 years ago
dehnert
edd3a9a20e
Added possibility to evaluate expressions without concrete variables. Fixed some minor things in CUDD Makefiles. Renamed IR adapter.
12 years ago