PBerger
90fc5faca2
Merge branch 'master' of https://sselab.de/lab9/private/git/storm
Former-commit-id: 6bae9c23cf
11 years ago
PBerger
1d8ae9fc89
Fixed an issue with templated variadic template arguments (see http://stackoverflow.com/questions/23119273/use-a-templated-variadic-template-parameter-as-specialized-parameter for discussion)
Former-commit-id: e7d2d054b6
11 years ago
dehnert
d57a0c9901
Replaced memcpy by std::copy.
Former-commit-id: ef31cf9977
11 years ago
dehnert
311247ff0c
Added support for Xor in expression classes and added parsing functionality for Xor, Implies and Iff.
Former-commit-id: 16e023cf26
11 years ago
dehnert
3940dbf45c
Accessing index of node via method interface, not member access.
Former-commit-id: d53006d5d4
11 years ago
dehnert
5fe7ffe51a
Added missing function declaration in CUDD'c C++ interface. Started on an iterator for DD valuations.
Former-commit-id: a97ccdec3d
11 years ago
dehnert
61d4bb956c
Added functionality to compare two ADDs up to a given precision. Added logical operator overloads to DD interface. Added tests for all new features.
Former-commit-id: 738ad49d62
11 years ago
dehnert
5a4730ae22
When exporting DDs to the dot format, edges leading to the zero node are now suppressed. Also, nodes in the dot file are now labeled with variable names (+ the number of the bit).
Former-commit-id: 410d61d333
11 years ago
masawei
6025dce144
Further work on the formuolas.
- Finished the third and last logic: Csl.
- Note that nothing compiles as of yet. This is due to the removal of the NoBoundOperators wich are expected to be replaced by filters.
Former-commit-id: d26ae768f7
11 years ago
PBerger
94b25c02ca
Fixed bugs in some files.
Made LTL a little better to compile under WIN32.
Former-commit-id: 71377f0672
11 years ago
dehnert
dc8921037e
Added missing test inputs.
Former-commit-id: 537971f365
11 years ago
PBerger
47b34171f2
Fixed a typo.
Former-commit-id: b5a3026aa9
11 years ago
dehnert
88a5be5b97
Unified some method names.
Former-commit-id: 3cda728bf6
11 years ago
dehnert
cc625a2e00
Added a ton of ifndefs, because MSVC does not yet support defaulting move constructors/assignments.
Former-commit-id: 105792abac
11 years ago
dehnert
164c8225fd
Fixed some minor issues.
Former-commit-id: 80f0ae4c9c
11 years ago
dehnert
7667933caf
First working version of explicit model generation using the new PRISM classes and expressions.
Former-commit-id: e71408cb89
11 years ago
dehnert
d9345b19e9
Further work on adapting explicit model generator to new PRISM classes.
Former-commit-id: 01cefceb52
11 years ago
dehnert
a642ba6e72
Started adapting dependent classes to new PRISM classes.
Former-commit-id: 59155b5fc9
11 years ago
dehnert
199b6576a9
Added ternary operator. Parsing standard PRISM models into the PRISM classes now works. Included tests for parsing stuff. ToDo: add remaining semantic checks for parsing/PRISM classes and fix explicit model adapter.
Former-commit-id: cb37c98f1f
11 years ago
masawei
0b9198122f
Done with PrCTL.
- Began removing NoBoundFormulas, since they might not be needed anymore. This task will be taken over by filters if they are to be implemented.
Next up: CSL
Former-commit-id: 6164f73737
11 years ago
dehnert
f6587b424d
Further work on PrismParser and the related PRISM classes...
Former-commit-id: be4ae055dd
11 years ago
masawei
b8317b7edf
Working in the new structure of the formula tree.
-Done with LTL.
-Working on PrCTL.
Former-commit-id: 1ec3c6993a
11 years ago
dehnert
e67eb05309
Changed internal data structures of PRISM classes slightly. Added classs for certain ingredients that were represented as primitives before.
Former-commit-id: bdc61e88a5
11 years ago
dehnert
cac8a50e90
Further work on PRISM grammar (commit to switch workplace).
Former-commit-id: 2969fe50a3
11 years ago
dehnert
7610bc8e76
Started reducing the complexity in the PRISM grammar.
Former-commit-id: c17dc6d27b
11 years ago
dehnert
eb2b2fed30
Hotfix for DD abstraction layer: copy and paste mistake in operator !\= is now fixed.
Former-commit-id: b815b7d7e8
11 years ago
dehnert
cc0c327668
Removed superfluous grammars and started working on making one PRISM grammar to rule them all.
Former-commit-id: 375acb4699
11 years ago
dehnert
41b31df0ab
Added small tests for implies/iff in expressions.
Former-commit-id: 3d90be7596
11 years ago
dehnert
d87c79d0f6
Added implies/iff to expression classes. Finished reworking PRISM classes.
Former-commit-id: ca202042ed
11 years ago
dehnert
d88876d0cd
PRISM classes almost adapted to new expression classes. TODO: source file of PRISM program.
Former-commit-id: 929a78684d
11 years ago
dehnert
5407978e8e
Minor update: PRISM variables now store whether an initial value for them was given explicitly in the program.
Former-commit-id: 6672539447
11 years ago
dehnert
0110758e3e
Further work on adapting classes that store a PRISM program to the new expressions. Commit to switch workplace.
Former-commit-id: 00c1b1324d
11 years ago
dehnert
6e1241211b
Started moving IR and adjusting it to the new expression classes.
Former-commit-id: 24a182701f
11 years ago
dehnert
8af52c8866
Finished new expression classes and corresponding functional tests.
Former-commit-id: 9268eab3a9
11 years ago
dehnert
ae06c7d677
Commit to switch workplace.
Former-commit-id: d828f3d255
11 years ago
dehnert
232f72ffaa
Further work on new expression classes.
Former-commit-id: 4b0a6bca70
11 years ago
dehnert
c8b5897cff
Designed interface of expression classes and started implementing it.
Former-commit-id: 67ac2a1764
11 years ago
dehnert
1d6c25547b
Further work on new expressions.
Former-commit-id: 1be5abbd68
11 years ago
dehnert
47b0f0b068
Further (preliminary) work on expression classes.
Former-commit-id: 71b71d6d3b
11 years ago
dehnert
c8a8beca2a
Started working on new easy-to-use expression classes.
Former-commit-id: 9ee1be5822
11 years ago
dehnert
33cce28df8
Fixed minor bug MILP-based minimal command set generator. GurobiLpSolver is now able to deal with constraints involving several instances of the same variable.
Former-commit-id: 4b5575a886
11 years ago
PBerger
7845a52ef4
Fixed a human error.
Fixed the same ambiguous call error in the second place.
Former-commit-id: b9fff85b67
11 years ago
PBerger
a55d5e2782
Fixed an ambiguous call to a constructor with initlists - poor GCC.
Former-commit-id: 8a8df68ad7
11 years ago
dehnert
88d9f36ef4
Added min/max abstract over DD variables to CUDD (actual code taken from PRISM). Added more tests for DD layer. Fixed some bugs in the DD layer.
Former-commit-id: a4b7810137
11 years ago
dehnert
0fce0444f7
Further bugfixes and tests for DD layer.
Former-commit-id: 32ef63f9b1
11 years ago
dehnert
cf5c04065e
Added streaming functionality to DD. More tests, more bugfixes.
Former-commit-id: 3c3078fbdc
11 years ago
sjunges
0eb13c6415
fixed a lot of unused variable warnings
Former-commit-id: 806f74b30d
11 years ago
sjunges
a528610d98
version is now written into a seperate header file to prevent recompile of many files after a commit
Former-commit-id: a287aacefa
11 years ago
dehnert
6b07643c96
Further tests for DD layer and bugfixing.
Former-commit-id: 752a8c55ac
11 years ago
dehnert
a4fec9f080
Started writing functional tests for DD abstraction layer and fixed some bugs on the way.
Former-commit-id: 8a2fc118be
11 years ago