PBerger
a39e9a821f
Fixed a type error in TBB implementation.
Former-commit-id: 680f43b36a
10 years ago
sjunges
4ba45efd1c
Merge branch 'parametricSystems' of https://sselab.de/lab9/private/git/storm into parametricSystems
Former-commit-id: b022b59c61
10 years ago
dehnert
ff572c7f6f
Sped up PRISM parser by letting it skip the actual command definitions in the first run (because only gathering constants, variables and formulas is important in this particular run).
Former-commit-id: 0b25c73fa4
10 years ago
dehnert
f485974187
Fixed (asynch) leader election to comply with our grammar. Added LOG_DEBUG macro.
Former-commit-id: 7b22ecba8e
10 years ago
masawei
1c4d7b9ef9
Some more testing.
Former-commit-id: 3105a0bf3b
10 years ago
dehnert
577e48f8bf
Bugfix for the dimensions of some data of parsed Markov automata.
Former-commit-id: ab11be9ec4
10 years ago
dehnert
93a08538e3
Reverted debug change in test.
Former-commit-id: efeacaf595
10 years ago
dehnert
7c5603de3e
Improved performance of the expression parser a bit more.
Former-commit-id: 7a0ae116c9
10 years ago
dehnert
952747a9bc
Modified some rules in the expression parser such that less redundant parsing is done.
Former-commit-id: aa072c9f9b
10 years ago
dehnert
aecd0e3cb8
Made Storm compile again without Z3: guarded some header inclusions and function definitions/implementations. Also guarded the tests that require certain libraries (like Gurobi, glpk, Z3), so that tests do not fail any more when the libraries are not available.
Former-commit-id: 307036e25c
10 years ago
dehnert
5bb76eb12e
Bugfix for storm::utility::vector::reduceVector to correctly compute which choices were taken to achieve extremal values.
Former-commit-id: c200835cf5
11 years ago
dehnert
e2c2177dca
Adapted MaxSAT-based minimal command set generator to some recent changes to make it work again.
Former-commit-id: 8f8c33b920
11 years ago
masawei
2c59dd6f32
Finished unit tests for the actions.
Next up: Update the parser tests.
Former-commit-id: c0db7bd1d4
11 years ago
masawei
ee1ebdf91d
Removed the visitor from LTL and refactured the formulas to use shared pointer in stead of standart pointer.
Next up: Continue testing.
Former-commit-id: 0103895e13
11 years ago
dehnert
40c698af90
Some fixes to make new SMT framework compile with clang under Mac OS (includes fixes to some initializiation ordering warnings). Bugfix for PRISM parser to correctly handle formulas.
Former-commit-id: d513476066
11 years ago
David_Korzeniewski
3887cb57aa
Fix for temporaries and non const references
Former-commit-id: 4eadf6cdab
11 years ago
David_Korzeniewski
ee89065b07
Fixed type error on gcc and clang (int_fast64_t is not the same type as on msvc)
Former-commit-id: 06f4ba0f60
11 years ago
David_Korzeniewski
430aa086be
Merge branch 'master' into SmtSolvers
Former-commit-id: f7a5827251
11 years ago
David_Korzeniewski
52d3d91060
Implemented Unsat Core/Assumtions & simple test
Former-commit-id: f79ee3a809
11 years ago
masawei
9fe246a98b
Renamed the folders containing the formulas to lowercase to adhere to the naming conventions and Started with testing.
-Tests for BoundAction done
Former-commit-id: d5698d3d53
11 years ago
dehnert
671797738a
Now the parameter that is set for dynamic reordering actually gets passed to CUDD.
Former-commit-id: 46676dc9d1
11 years ago
David_Korzeniewski
a815a6f425
Implemented allSat with z3 and test
Former-commit-id: 3795fc00c2
11 years ago
David_Korzeniewski
93c03fff3f
Fixed order of checks in Z3ExpressionAdapter, fixed missing override of isVariable in VariableExpression, removed unnecessary exception in Z3SmtSolver model generation
Former-commit-id: ca5f876655
11 years ago
David_Korzeniewski
758fac5389
Merge branch 'master' into SmtSolvers
Former-commit-id: 57915f3aa9
11 years ago
masawei
df5bafc38b
Finished the implementation of the Cls and Ltl filters.
-Mostly copy and paste from the prctl version with some individual changes.
Next up: Testing.
Former-commit-id: 19a4f90255
11 years ago
masawei
a5e28fcf04
Added some filter actions.
- Also major cleanup of the filter.
- Implementation clompleted for pctl.
Next up: Wrap up the Csl and Ltl filter and then testing.
Former-commit-id: 8189f8462c
11 years ago
dehnert
caf96c04e0
Extended DD interface by methods to generate explicit row-grouped matrices from DDs.
Former-commit-id: 1945d7be6d
11 years ago
dehnert
8587f68eb1
Fixed toMatrix conversion using ODDs. The next step is to generate non-deterministic matrices, i.e., matrices with row groups.
Former-commit-id: e4a9c5f0ed
11 years ago
dehnert
084bb14acd
Bugfix for expression parser.
Former-commit-id: 2b03856c86
11 years ago
dehnert
236e7fa290
Another step towards generating explicit data structures from DDs using ODDs.
Former-commit-id: 5b7e3e8680
11 years ago
dehnert
f12ff82baf
Added getNodeCount for ODD and fixed a bug concerning boolean meta variables.
Former-commit-id: 79eb69226b
11 years ago
dehnert
5d53c6efa5
Added ODD-concept to easily convert between DD-based and explicit formats.
Former-commit-id: f2a2a002b7
11 years ago
dehnert
dd73387ed1
Add missing case.
Former-commit-id: b30aa3bc0d
11 years ago
dehnert
72cc5f2188
Added 'power' as a binary operator in expression classes and expression grammar.
Former-commit-id: c58321709e
11 years ago
dehnert
478f5ee38c
Started separating expression parsing from PRISM model parsing.
Former-commit-id: 84d1354f97
11 years ago
dehnert
28eed65a0d
Fixed a reference to a non-existant option.
Former-commit-id: 02020513cc
11 years ago
PBerger
5503e91bb3
Added detailed time measurement using std::chrono, leading to more useful information for comparison against Prism, etc.
Former-commit-id: 98e3e8e097
11 years ago
PBerger
7ab2a84c0f
Small beauty fixes to the Cudd Interface
Former-commit-id: 631d5a20bd
11 years ago
PBerger
03399375f8
Fixed an unintended 32bit shift being expanded to 64 bit
Former-commit-id: b2adc2a5ba
11 years ago
PBerger
b5cb0cde1d
Fixed a typo in the StormOptions.cpp
Former-commit-id: a23d47d112
11 years ago
PBerger
b7ad4398e2
Fixed an error in the interface of the LpSolvers.
Former-commit-id: 65e415efb2
11 years ago
dehnert
9a7c24372e
Added crude version of 'dump to explicit format' for Dtmcs.
Former-commit-id: bbe6195046
11 years ago
dehnert
63f55b38f0
Removed debug output that was - of course - never there. (You saw nothing!)
Former-commit-id: 9249928f54
11 years ago
dehnert
7b2def2b11
Added function to retrieve the minterms of a DD as an expression and added corresponding test.
Former-commit-id: afaf1f02a3
11 years ago
dehnert
e79fa50999
Changed naming of DD variables belonging to one meta variable slightly: only integer-valued meta variables now get a '.i' suffix to denote their i-th bit.
Former-commit-id: 771312ac31
11 years ago
dehnert
60b2145461
Added function to DD interface that creates a nested if-then-else expression that represents the very same function as the DD. Added a test for this functionality. Added some methods offereded by Cudd to simplify DDs.
Former-commit-id: 4fc816f64b
11 years ago
masawei
3271e73f01
Fixed the last test. All tests green now (well, except the ones that need gurobi, which I don't have).
Former-commit-id: 7636a2a6ab
11 years ago
masawei
9a28e5b580
Added proper formula string method to filters.
- Lots of debugging
- Changed the way the filter keeps information about the scheduler to use for probability/reward queries.
| This was done by keeping a special action at the first position of the action list.
| Which was not exactly consistent with the idea behind the filter actions.
| Now the filter keeps this information as an enum value in a member variable.
- All but one tests are green. So we almost reestablished full functionality.
|- The last test that still fails is SparseMdpPrctlModelCheckerTest.Dice where the second to last model check returns the wrong result.
Next up: Debug. Then introduce the full range of filter actions.
Former-commit-id: fd311966cc
11 years ago
dehnert
1513241985
Added functions for more efficiently retrieving the DD for 'greater than constant', 'greater or equal than constant' and 'notZero'.
Former-commit-id: 9d80c29f27
11 years ago
dehnert
b1f22c1747
Added shortcut DD interface to compute \'greaterZero\' on a DD.
Former-commit-id: 65585533fd
11 years ago