Dave Parker
441b278ed8
LTL2RabinLibrary: provide draForSimpleUntilFormula(), generating automata for a simple path formula with bounds. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9597 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
5cd35caeda
Missing adds/removes from last few commits
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9579 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
02aa30d5bf
Use AcceptanceRabin internally in prism.DRA. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9577 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
ad6c3b4800
Add acceptance.* package, with AcceptanceOmega and derived classes for BitSet-based acceptance and AcceptanceOmegaDD for JDD-based acceptance. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9576 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
4849d6d603
Remove check for lower bounds in path formulas for DTMC, MDP. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9573 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
b8f6644f53
IntegerBound class for convenient handling of lower/upper bounds and intervals. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9570 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
e5decef2c1
IntegerBound class for convenient handling of lower/upper bounds and intervals. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9564 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
a9f4c14409
Don't allow lower time-bounds for weak until (e.g., for a W[l,u] b or a W>=l b) due to unintuitive semantics. [From Joachim Klein; but moved check to higher up]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9563 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
95feea13ce
New common.IterableBitSet and common.IterableStateSet classes [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9542 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
280bb04868
Initial states also exported by -exporttarget for multi-objective.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9529 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
913f80a8e9
Minor refactoring and alignment between PS_NondetMultiReach.cc and PS_NondetMultiReach1.cc.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9528 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9589a14c14
Compile fix for previous commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9526 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
1d09274252
Add adversary export to reward-based multi-objective model checking (sparse engine) - not sure why it was not there.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9524 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
8c50fe44da
Error message typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9523 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
48183cecf5
Output bug in StateValuesDV (prints := not : when there are indices but no states).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9522 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
8342d6fcee
Fix typo in last commmit
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9520 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9d82693baf
Improvements to build process for Linux/Mac versions of lp_solve_java.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9519 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
2ddaf97daf
Experimental way of detecting jni.h if it is not in the same place as javac (e.g. on OS X Yosemite?).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9518 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Ernst Moritz Hahn
892ecc31e4
fix for dtmcs with overlapping commands
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9516 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Ernst Moritz Hahn
363b6c0442
added forgotten deep copy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9515 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Ernst Moritz Hahn
ac7b9d7f80
removed warning
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9514 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Ernst Moritz Hahn
2e0463c231
corrected choice of order in which states were eliminated. The previous approach lead to states always being eliminated in ascending state number order.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9513 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
835d4a9a45
2 ref/deref bugfixes from Joachim Klein.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9512 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
cc8d3883f6
Expected total rewards (R[C]) implemented for DTMCs in symbolic engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9511 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
789d7789bb
Bug fix in export of DRAs for multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9509 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5865c0fd89
Bug fix in exporting product during multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9504 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
96dc514de3
Re-factoring in multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9500 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
1f27c28465
Re-factoring in multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9481 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
753d0d470a
Re-factoring in multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9469 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
4f30f4f774
Re-factoring in multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9468 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b91b8f0b12
Re-factoring in multi-objective model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9467 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7798782029
Refactoring of extraction of rewards in multi-objective model checking engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9466 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
806b7b181d
Refactoring of extraction of rewards in symbolic model checking engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9465 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago