Dave Parker
|
a025ae2e07
|
Add model checking of R[C] operator for CTMCs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11041 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
4c13267ded
|
Add test methods for special cases in ExpressionLabels.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11028 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
de50d8d145
|
Small update to previous commit: display filter size *before* possibly optimising it.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11011 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
031a14e778
|
Small optimisation when model checking filters: Reduce set of filter states to the first state if filter is "first". [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11009 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
66ea7475a7
|
Optimisation when dealing with filters: perform cardinality check for "state" filters earlier. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11008 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
eda5876325
|
Minor refactoring, ahead of upcoming patches. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11007 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
0f2bbbc7b6
|
Add some (syntactic) reward info to the ModelInfo interface and use this where possible in explicit model checking. Can now use ModulesFileModelGenerator for reward property model checking. Also push constant info from ModelGenerator up to ModelInfo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11006 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
c8a894cae2
|
Auto-format.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11000 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
d4a86d5c2d
|
Remove ModelExplorer interface and replace with ModelGenerator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10992 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
589b0b1a17
|
Remove defunct field from ConstructModel.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10982 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
0e01288705
|
Improve explicit.ConstructModel: generalise to use new ModelGenerator interface (not just ModulesFiles via the simulator) and tidy up the settings within the class.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10976 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
9ce7e6441b
|
Push containsUnboundedVariables methof from VarList up into ModulesFile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10970 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
4aea86b501
|
Comment clarifications.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10945 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
e85cceb572
|
Small tidies/fixes in explicit engine MDP strat generation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10913 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
fb37c9a22d
|
Slight refactoring of strategy storage in explicit engine (to match PRISM-games).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10910 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
8597f0e71b
|
Extend previous commit (reachability enlarging target) to STPG model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10875 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
bf76e587bc
|
Small optimisation in explicit model checkers, when enlarging target for reachability. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10874 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
9255d29ac8
|
Fix some unclosed logs when exporting. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10873 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
c373555f9c
|
Refactoring multi-objective code: readying for allowing lists of objectives in strategy operator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10849 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
10 years ago |
Dave Parker
|
4ee20e5583
|
Bug fix in lifting reward structures to a product model (when there are some states with no transition rewards).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10750 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
11c1a65260
|
Allow wider ranger of co-safe LTL formulae inside an R operator (more precisely, those that can also be rewritten into co-safe form).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10614 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
31877c0f2d
|
Small refactoring in DTMCExplicit: cleaner implementation of iterator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10605 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Joachim Klein
|
eeddcf9039
|
Add hasTransitionRewards() method to explicit Reward interface.
Currently, the main use is to determinie whether a MDPRewards has
any transition rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10579 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Joachim Klein
|
5d33639dd7
|
explicit.LTLModelChecker: Comment whitespace
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10578 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Joachim Klein
|
298266c1cd
|
explicit.LTLModelChecker: construct a VarList for the Model-DA product if the model had a varlist
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10576 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Joachim Klein
|
35461f5e2f
|
explicit: setVarList() / getVarList() for the explicit models
Mirrors the corresponding infrastructure for he symbolic models
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10575 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Joachim Klein
|
fd5c1c90d8
|
ECComputerDefault: optimize by using BitSet.isEmpty() instead of BitSet.cardinality() == 0
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10572 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
ad238d314c
|
Allow -exportpropaut to export DA in HOA format, e.g.: prism dice.pm -pf "P=?[X X d=6]" -exportpropaut:hoa da.hoa
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10537 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
4050c50235
|
Support <<>> and [[]] operators for MDP (only * or empty), all engines.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10421 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
6afda907f6
|
Check <<>> operator for MDPs in explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10420 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
590ae94e9f
|
Refactor explicit engine product construction.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10398 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
80c8dcd09d
|
Refactor explicit engine product construction.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10393 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
e893970d22
|
Add some (already implemented) methods to ModelSimple interface.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10383 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
0603e4a9b5
|
Some refactoring in explicit model checking engines: create new child model checkers, rather than inheriting their functionality as a subclass(e.g. DTMCModelChecker from CTMCModelChecker) - avoids problems where some methods are not implemented in the subclass.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10372 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
6e89edfedb
|
Co-safe reward model checking for CTMCs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10358 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
bfeb0d0b69
|
Implement lifting to product for STPG rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10356 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
1762db4d34
|
Bugfix in lifting rewards to product.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10355 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
21d663816a
|
Push lifting of (explicit) reward structures into Reward classes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10354 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
df63c6e9a1
|
Refactoring: StateRewardsArray extends StateRewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10353 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
87bce928b1
|
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10352 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
303d31be14
|
Better error message for non-co-safe properties in R operators.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10351 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
a76b3c73bd
|
Remove (most) usage of R_F in temporal operators.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10344 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
17a946783d
|
Disallow properties of the form R[F<=k].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10343 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
8a9701e7ec
|
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10339 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
69c8b2ce1f
|
Bug fix: better detection of R[F] when seeing if it is cosafe.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10338 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
fee3972b20
|
Bug fix in explicit co-ssafe reward computation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10336 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
54bf906cc3
|
Missing -exporttarget case.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10335 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
957148215e
|
Support (symbolic/explicit) for expected reward to satisfy a co-safe LTL formula.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10334 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
c8e181ffda
|
explicit.ProbModelChecker: Add statesOfInterest to a few more functions (for merging purposes).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10331 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
9e434ad9ea
|
Merge in explicit engine detection of end components for Streett acceptance. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10325 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |