Joachim Klein
3757da3fa0
imported patch rewardcounter-TemporalOperatorBounds-use.patch
7 years ago
Joachim Klein
7345668608
imported patch rewardcounter-TemporalOperatorBound-use.patch
7 years ago
Joachim Klein
3aff21fcee
imported patch explicit-fairness-warning.patch
7 years ago
Joachim Klein
47d5e573d6
Use reachability reward computation for complex state formulas
E.g., R=?[ F (a & A[F b])] was previously handled via co-safety, as
the operand of the F operator is not a proposition.
7 years ago
Joachim Klein
2ed6c9486e
imported patch ex-dtmc-weights-support-negative-rewards.patch
7 years ago
Joachim Klein
c7203567b0
explicit: indicate 'not supported' for state reward export in unsupported formats
7 years ago
Joachim Klein
a14171b0b8
explicit model checkers: flag to silence log output during precomputations (prob0/1...)
Sometimes, we want to use the prob0/1... methods to generate schedulers instead of doing
the standard precomputations and don't want to have the normal log output.
Not inherited using inheritSettings()
8 years ago
Joachim Klein
9b94039049
(explicit iteration refactoring) new infrastructure to provide consolidated methods for doing the numerical iteration computations.
Support for topological iteration, periodic updates, backwards Gauss-Seidel.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12127 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c809c66ae9
explicit.MDPModelChecker: Rmax[ C ] (total reward) computation
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12030 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
c4ed300c01
Add state reward export for explicit engine; also some refactoring of reward exporting
(in particular, move logic for splitting into multiple reward files up to prism.Prism)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12001 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
0ee323ea6a
explicit.MDPModelChecker: implement instantaneous reward computation (Rmax/min [I=x])
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11979 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
28b741819d
Optimise computation of expected instantaenous rewards (R[I=k]) for DTMCs when the value is only required for one state (explicit engine).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11975 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
6935798edf
explicit.ProbModelChecker: provide constructRewards(model, rewardStructureIndex)
Deprecate the previous methods using RewardStruct, as those don't work with
arbitrary model generators.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11784 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
9890d74315
Various improvements focused on the ModelGenerator interface:
- Extended functionality available through the prism.Prism API when using ModelGenerators
- Improvements to ModelGenerator interface wrt handling of rewards (and also labels)
- Explicit engine model checkers now build rewards from a ModelGenerator, not a RewardStruct.
This is now (optionally) attached with the setModulesFileAndPropertiesFile method.
- New code to generate symbolic models from ModelGenerators (useful, if not super efficient)
- Move createVarList() method from ModelGenerator up to ModelInfo
- Some code tidying in LabelList
Code was previously at https://github.com/prismmodelchecker/prism-svn/tree/model-generator
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11772 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
9a2d757554
explicit.ConstructRewards: error on negative rewards, use automatic close for BufferedReader
Optionally, negative rewards can also be accepted to allow dealing with weights in other branches.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11752 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
0e57919d0e
explicit engine: Properly signal "not supported" for MDP total reward computations
Previously,
prism prism-examples/dice/two_dice.nm -pf 'Rmax=?[C]' -ex
would yield a NullPointerException.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11522 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
d309f8c748
Comment fix.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11406 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
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
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
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
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
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
10 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
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
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
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
852398415b
Add R[C] model checking for explicit DTMC model checker too (not really testeed much yet).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10215 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
88eb9ae71a
Re-rename new predecessor option (-nocachepre to -noprerel, etc.)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10197 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5570bbe256
Change -nobackward option to -nocachepre.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10195 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c7dbacf85f
Add option -nobackward to PrismSettings (disables computations relying on the predecessor relation). [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10193 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d0f3e91387
Some code tidying (automatic mostly) for merging purposes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10067 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b12953b937
Make use of the new PrismNotSupportedException.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9999 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
60ecccd9da
New setting/switch: -pathviaautomata (all path formulas are handled via the LTL/DRA-engine), defaults to false. Honour in model checkers. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9601 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d9ec3199b9
Refactoring: Expression.convertSimplePathFormulaToCanonicalForm(), converts to (negated) a U b or X a. Use in model checkers. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9595 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5dc15ad61b
update checkProbBoundedUntil() in the model checkers to handle lower bounds as well. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9572 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
797f9494b2
Explicit engine: Add BitSet statesOfInterest parameter to the various checkExpression... methods [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9545 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
82de131735
Small fix for previous commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9460 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
72c2d1602e
Refactoring of extraction of info from P/R/S operators (in explicit engine).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9458 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
3d847fb635
Push coalition info into a separate class (including option for * = all players).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9446 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0bb55587be
Allow <<>> to be used for MDPs (explicit engine only).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9444 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
e24275eb8c
Small refactor for reward construction in explicit model checkers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8814 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
31690047fa
Refactor extraction of reward struct from index in R.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8806 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
f24243ff50
Finish refactoring from last commit (missed something in STPG model checker).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8687 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
22e7009d7b
Refactor explicit engine model checking of reward and steady state operators, as done recently for probabilistic stuff.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8686 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago