Dave Parker
9aae5befb4
DTMCFromMDPMemorylessAdversary gives actions from MDP.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10077 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5b8f3cd4d6
Add iterator to get actions from a DTMC (not usually stored, yet), defaulting them to null, and display these from exportToPrismExplicitTra().
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10076 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
835e95a861
Don't print optimal strategy to screen when exporting it (explicit engine).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10042 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b4f05f3cd0
Add possibility to specify type to -exportpropaut switch (dot or txt), e.g. -exportpropaut:dot dra.dot.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10018 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c17f92e172
Add LTS model type and expose underlying graph of a DA as an LTS.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10012 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
e9afcf0419
Add default implementation of infoString() and infoStringTable() to ModelExplicit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10011 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
be834a8aff
Align explicit SCComputer with symbolic one - it should not include trivial SCCs in the set computed; these should be stored separately.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10010 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
98dcb3c803
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10008 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7352ad17b3
Small optimisation in LTL model checking: reduce number of propositions used in deterministic automaton by checking for negations.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10002 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
0b05a40aec
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9957 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
a95d56bc20
Comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9953 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
6e1cf75a8e
Some re-factoring of LTL model checking in the explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9921 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5e92fabe95
Comment typo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9919 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c5b40f44d8
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9913 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
32ad9bbaae
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9912 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
3e990e89e3
Some tidying/fixing in EC generation, including proper support in the explicit engine version for finding ECs that intersect with "accept".
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9906 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
53cb310c7a
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9901 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
60a30d7038
Comment typo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9865 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9729c78b3e
Inefficiency in precomputatino routines in explicit engine (spotted by Steffen Marcker).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9850 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
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