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
bb6693f43d
Allow comments to have no trailing new-line (e.g. when occurring at very end of file) - cannot see a good reason not to allow this.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9851 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
a744b15a7e
Fix (again) computation of number of nondet choices for symbolic models (did not work for large number of nondet DD vars).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9848 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5557db131f
Remove debug output.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9847 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
56e323a2b4
Fix computation of number of nondet choices for symbolic models (did not work for large number of nondet DD vars).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9845 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9fc29a3b25
Bug fix in symbolic model checking of co-safe properties (target was not ANDed with reachable states).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9833 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
38f0e001c2
Bugfix in PrismParser.isKeyword (leading to incorrect identification of bad identifiers in SBML/reactions to PRISM translation).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9733 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b8fc45249e
Added sbml2prism script.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9732 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
3b8d17c352
Missing toString in AcceptanceReach (and output tweak in DA).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9696 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
33ddccaf6b
Add larger P icon (256x256).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9685 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
ddeaef392e
Exeutable bit on.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9677 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0ae5d13247
Bug in building lp_solve_java on ia65 (from Alexandre Duret-Lutz).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9671 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
cb294345ee
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9655 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
ec4ddc4513
Add DASimplify. Currently supports simplifying DRA to DFA if the acceptance has a special form. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9609 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c77bd235df
Add AcceptanceReach, AcceptanceReachDD (for DFA style acceptance). [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9608 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d0384142bc
LTLModelChecker: remove buildLStatesForRabinPair and buildKStatesForRabinPair, not needed anymore. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9607 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5b5bac7fe3
Adapt (symbolic) LTLModelChecker to support generic acceptance types for MDP. [Joachim Klein]
Adapt product construction (rename dra to da)
Add findAcceptingECStates() wrapper to support more acceptance types in the future.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9606 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
a16aeb57dc
Adapt (symbolic) adapt LTLModelChecker to support generic acceptance types for DTMC. [Joachim Klein]
Adapt product construction (rename dra to da)
Switch from findAcceptingBSCCsForRabin() to generic findAcceptingBSCCs()
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9605 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
6ff3094b91
jltl2dstar: support generation of Rabin and Streett automata. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9602 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
e02281dc86
Add Expression.isPathFormula(). [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9599 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
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