dc82a6ef67
Fix explicit engine import of state rewards (need to add details to ModelInfo for it to work properly). Also catch attempts to export state rewards more cleanly in this case.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12150 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
80aec9a2fa
cleanup some import warnings, artifacts of the recent set of refactorings...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12149 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
c6df34232c
DTMC total reward, explicit: fix output glitch
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12148 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
e138c51891
GUI, settings dialog: Make the comment area at the bottom vertically scrollable.
This allows display of longer comment text for a given setting.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12147 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
35858d3339
GUI, settings dialog: larger preferred width
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12146 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
126e21550a
explicit.ConstructModel: Convert DTMCSimple to DTMCSparse (as for MDPs) [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12145 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
7ac2b39ca6
explicit.DTMCSparse: sparse storage variant for DTMCs [with Steffen Maercker]
adapted from MDPSparse
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12144 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
730785ea5f
explicit.MDPSparse: simplify code for getTransitionsIterator
Use AbstractMap.SimpleImmutableEntry and remove methods that have
default implementations since JDK8.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12143 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
65fd5cd795
(interval iteration, explicit) actually perform interval iteration using the explicit engine
Supported:
DTMC reachability probability and expected reward computations.
MDP Pmax, Pmin, Rmax, Rmin for reachability.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12142 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
d9bad734bd
(interval iteration, explicit) provide IterationMethod computations for interval iteration
Add some default computations for interval iteration to DTMC / MDP
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12141 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
76c601e2c9
(interval iteration, symbolic) actually perform interval iteration using the symbolic engines
Supported:
DTMC reachability probability and expected reward computations.
MDP Pmax, Pmin, Rmax for reachability.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12140 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
c1efd5233b
(interval iteration, symbolic) interval iteration variants for the computation methods of MTBDD, Hybrid and Sparse
Note: PH_NondetReachRewardInterval.cc has not been tested, the standard variant
is not exposed in PRISM currently.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12139 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
9ae9116ff4
(interval iteration) currently, multi objective model checker should not use interval iteration
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12138 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
c8335ca642
(interval iteration) prepare settings for interval iteration
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12137 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
9735731c59
PrismSettings: refactor option splitting (for -switch:options), provide access to raw option string
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12136 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
430713ca65
(interval iteration) PrismUtils: add helper methods for interval iteration
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12135 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
9d98dab1c3
(interval iteration) include/Measures.h: provide helper functions for interval iteration
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12134 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
c4b7b0db3e
explicit.IncomingChoiceRelation
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12133 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
e97b72f6e6
explicit.MDPModelChecker: check for zero-reward ECs for Rmin=?[ F ] computations, use quotient model if necessary
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12132 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
1ce1446eb5
explicit.MDPModelChecker: support backward Gauss-Seidel during policy iteration
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12131 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
452d89e411
(explicit iteration refactoring) Expose topological value iterations via the -topological switch
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12130 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
12e377de4a
(explicit iteration refactoring) DTMCModelChecker: use the new infrastructure for doing the numerical iteration computations.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12129 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
fae160729c
(explicit iteration refactoring) DTMCModelChecker: use the new infrastructure for doing the numerical iteration computations.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12128 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
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
7486c6d7ed
For MDP model checking (explicit, symbolic), support -pmaxquotient option (computation in MEC quotient)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12126 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
87675e828a
explicit.MDPModelChecker: split numeric computation part of computeReachProbs into separate method
Preparation for upcoming interval iteration commits, etc.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12125 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
2fe2f918b3
explicit.MDPSparse: add constructor from arbitrary MDP [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12124 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
265e827391
explicit.ZeroRewardECQuotient
Quotient of an MDP where the zero-reward maximal end components
are collapsed to single states.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12123 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
03dafaa170
explicit.modelviews: Various helpers for providing modified views of a given DTMC / MDP [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12122 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
ec4e55d708
IteratorTools [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12121 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
61701b9f1b
some more helpers for iterators / predicates [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12120 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
86f75d975a
explicit.BasicModelTransformation [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12119 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
7073b3bc4e
explicit.StateValues: getType()
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12118 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
798dd1e859
Distribution: provide constructor from Iterator over the transitions (Entry<Integer, Double>)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12117 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
20ae1aa61d
(for trunk) PeriodicTimer
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12116 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
881a571870
explicit DOT export: support decorators
This commit refactors the exportToDotFile infrastructure of
the explicit engine to allow the flexible decoration of the
nodes and edges in the DOT file, e.g., for annotating rewards,
marking certain states, etc.
We provide default implementations in explicit.Model for most methods,
only exportTransitionsToDotFile needs to be provided in derived classes
to allow DOT export.
Note that the abstract method in ModelExplicit
abstract void exportTransitionsToDotFile(int i, PrismLog out);
has been removed, which will lead to errors in derived classes
where implementations of this method have been marked with the
@Override annotation.
To fix this, simply replace the signature of your implementation of
void exportTransitionsToDotFile(int i, PrismLog out);
by
void exportTransitionsToDotFile(int i, PrismLog out, Iterable<explicit.graphviz.Decorator> decorators)
(as defined in explicit.Model). You can simply ignore the decorators
parameter at first. Later on, if you want to support decoration,
have a look at the implementations of this method in DTMCExplicit
and MDPExplicit for the proper handling.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12115 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
59745d025c
explicit.graphviz: infrastructure for more flexible DOT exports
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12114 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
0cc16c1f9f
explicit.SCCComputer: convenience method forSCCs for functional-style iteration over the SCCs of a model
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12113 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
7d5105c8c1
explicit.SCCInfo, SCCComputer: method for obtaining topological ordering (SCCInfo)
An SCCInfo provides IntSet-based access to the various SCCs. This storage option
can be more efficient than to store BitSets for each individual SCC, in particular
if trivial SCCs are not filtered and there are lots of states.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12112 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
3d8c4e1ff8
explicit.SCCComputer: provide variant of computeSCCs where the state space is restricted with an IntPredicate
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12111 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
97074f5d58
Refactor explicit SCC computation, splitting SCCConsumer from SCCComputer.
To obtain the previous behaviour, change
SCCComputer sccs = SCCComputer.createSCCComputer(parent, model);
sccs.computeSCCs();
... = sccs.getSCCs();
to
SCCConsumerStore sccs = new SCCConsumerStore();
SCCComputer sccComp = SCCComputer.createSCCComputer(parent, model, sccs);
sccComp.computeSCCs();
... = sccs.getSCCs();
This additional flexibility in how SCCs can be consumed can be used
in the future for example to handle SCCs on-the-fly, without
having to store all of them at the same time.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12110 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
fe5d031751
SCCTarjan: use SuccessorsIterator
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12109 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
810f149e88
PrismUtils: findMaxFinite
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12108 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
a11d7c9797
JDD, prism.StateValues: find max finite value
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12107 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
95283773a9
explicit: StateValues, implement maxFiniteOverBitSet
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12106 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
f4fdac9baa
add common.IntSet: interface for an ordered set of integers, providing fast membership test
Wrappers for BitSet and singleton values are provided.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12105 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
9b5245f04f
explicit DTMCSimple, MDPSimple refactor: remove mv... specialisations so the default methods from DTMC/MDP are used
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12104 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
dc8e331a36
explicit.MDP: provide OfInt-based variants for mvMultMinMax, mvMultGSMinMax, mvMultRewMinMax, mvMultRewGSMinMax
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12103 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
803f856ca9
explicit.MDP: default implementations for several mvMult methods
mvMultMinMaxSingle
mvMultMinMaxSingleChoices
mvMultSingle
mvMultJacMinMaxSingle
mvMultJacSingle
mvMultRewMinMaxSingle
mvMultRewSingle
mvMultRewJacMinMaxSingle
mvMultRewJacSingle
mvMultRewMinMaxSingleChoices
mvMultRight
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12102 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
a216904acb
explicit.MDP: use OfInt based iterator in default implementations of mv... methods
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12101 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker