Dave Parker
6a1417c6f4
Bug fix in explicit engine CTMC until model checking (spotted by Chris Dehnert) (probably due to recent ProbModelChecker refactoring).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9699 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f7f4bf5f51
Model checkers: use DASimplify, allow AcceptanceReach in computations. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9610 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b6f3b2dce3
Adapt (explicit) LTLModelChecker to support generic acceptance types. [Joachim Klein]
Adapt product constructions (rename dra to da, generic lifting of acceptance)
Generic findAcceptingBSCCs() and findAcceptingECStates()
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9604 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f644011ba2
Refactor LTL-to-deterministic automaton generation, introduce LTL2DA and use LTL2RabinLibrary only for hard-coded and specially crafted DRA. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9603 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
15a48d4fff
LTLModelChecker.isSupportedLTLFormula(), for checking whether a path formula can be handled. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9600 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9ad8e8165e
LTL2RabinLibrary and model checkers: support automata based constructions for temporal bounds for simple path formulas. Now, the constantValues from the model checker have to be passed to LTL2RabinLibrary to allow resolving constants in the bounds. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9598 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
be5cdf908a
Provide getConstantValues() for model checkers, allowing other classes to access the constants. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9596 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
a18d74e5b6
provide LTLModelChecker.constructProductMDP(MDP mdp, Expression ltl), encapsulating DA generation and product construction. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9594 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
e3ce1e85ee
provide LTLModelChecker.constructProductMC(DTMC dtmc, Expression ltl), encapsulating DA generation and product construction. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9593 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
ab81007716
Lift stored labels and statelist to the product model. [Joachim Klein]
This is a big step towards making the product model a "normal" model, supporting model checking on the product model.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9592 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
36991a899a
Refactor LTL product construction in explicit engine. [Joachim Klein]
LTLModelChecker: add LTLProduct, translation between product and model / automaton states.
Refactor explicit.DTMCModelChecker to use Product for DRA product
Refactor explicit.MDPModelChecker to use Product for DRA product
Switch to using AcceptanceRabin in the Product instead of passing DRA to the findAcceptingBSCC etc routines
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9591 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
150775d09f
Add ModelTransformation interface and abstract Product class for product of model and automaton. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9588 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c00ffea7d8
Refactor: switch from prism.DRA<BitSet> to prism.DA<BitSet, AcceptanceRabin>. Changes access to the Rabin pairs. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9578 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7e6f8e8cf6
Revert recent DFA optimizations to allow for acceptance type refactoring. Functionality will be later readded using AcceptanceReach. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9575 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
e77138a79f
computeRestrictedNext() for ProbModelChecker, NondetModelChecker, DTMCModelChecker and MDPModelChecker. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9571 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0b8223c685
Explicit engine: Add BitSet statesOfInterest parameter to the various checkExpression... methods [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9551 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
bb6a80f978
SubNondetModel: more efficient allSuccessorsInSet and someSuccessorsInSet [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9544 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
a18d28a17b
Refactor: use IterableStateSet to simplify loops [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9543 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5849798cf0
Allow -importinitdist (and anything else that uses StateValues.readFromFile) to read vector files with lines of the form i:x, not just x.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9521 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9f4a6dba5f
LTL explicit engine bug fix (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9501 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
1f0382a0b6
LTL model checking optimisation - skip BSCC/EC detection if DRA is (syntactically) a DFA.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9431 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
50e8d24c02
Add -exportpropaut option (hidden) to export DRA(s) in textual form.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9420 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
99bdf07b49
Fix in SubNondetModel: getSuccessorsIterator should return a set (i.e. no duplicates).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9381 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7c687d5195
Bugfix in MDPSparse (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9373 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
1314f91107
Bugfix in SubNondetModel (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9372 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5295b1a180
Bug fix in MDPSimple.mvMultJacSingle (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9359 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
aba185d835
Bugfix - explicit-state model checking for LTL on CTMCs (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9356 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
75b20e5801
Some additional error checking in explicit.StateValues (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9160 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
690d7d93aa
Some additional error checking in explicit.StateValues (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9158 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0a5e0b6203
Additional checks in explicit MDP model checker: don't allow policy iteration methods to be use when 'known' values are passed in (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9157 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
63c7d1fcd0
Added a getLabels() method to the explicit.Model hierarchty (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9156 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Ernst Moritz Hahn
33a7f2c9e8
fixed computation of lost probability to take into account probability mass intentionally destroyed
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9138 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Ernst Moritz Hahn
a50a254805
bugfix fau
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9122 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
7f10ec8b60
Bug in explicit engine LTL model checking (happens when there are multiple APs in the formula and ordering is different in the DRA). Reported by Manfred Jaeger.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9091 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
89fab7269a
Bug fix in getSuccessorsIterator(s) in SubNondetModel (showed up as regression test failure in prism-games-heuristics-merge), plus required missing method getSuccessorsIterator(s,i) in NondetModel.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8935 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
afd1c35480
Remove getTransitionsIterator from NondetModel.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8861 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
d1e2870fbc
Small refactor for reward construction in other model checkers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8819 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 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
51191706bb
Minor refactor (aligning with something in a branch).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8803 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
8ce321ffb9
Code tidy (incl. remove warnings) to help with merging.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8783 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