Joachim Klein
3d51fd0f8f
ExpressionUnaryOp, ExpressionBinaryOp: setOperator from symbol (string), for convenience
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11754 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c076b3e005
explicit.ModelTransformation: remove unnecessary Exception [from Steffen Märcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11753 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
9a2d757554
explicit.ConstructRewards: error on negative rewards, use automatic close for BufferedReader
Optionally, negative rewards can also be accepted to allow dealing with weights in other branches.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11752 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
3d1ee7a66f
LTL2DA.convertLTLFormulaToDAWithExternalTool: honor PRISM_NO_DA_SIMPLIFY setting
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11751 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
5c68cf3c2b
param.BigRational: fix BigRational.MONE definition
MONE is not used in the current code base.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11750 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
494f61adeb
PrismSTPGAbstractRefine: cleanup refactoring from SVN 11747
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11749 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
890620fd5f
PrismSTPGAbstractRefine: set initial states from the label file
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11748 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
0667019a05
explicit: Make calls to StateModelChecker.loadLabelsFile static
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11747 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
55c0034a18
explicit model import: some more minor fixes to set correct initial states
Followup to SVN 11744.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11746 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
a6eb2bd327
Add support for a state rewards file when doing explicit model import (not the explicit engine).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11745 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
81451753d1
Bug fix for explicit engine model import - we should not assume that the initial state is 0. This also highlights a bug that ModelExplicit should store initial states as a state, not a list, but that issue is not fixed here.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11744 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
0f9dfe0275
prism-auto: Make sure nailgun is closed down if the script ends with an error (and refactor the exit code).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11743 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
2a38cf110b
prism-auto: Don't actually execute nailgun commands in echo mode - just print them.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11742 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
5ae882f609
prism.ExplicitFiles2MTBDD: better I/O error messages
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11741 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
19cb2b45b5
arser.ExplicitFiles2ModulesFile: create label definitions in the ModulesFile for all labels in .lab file [with Steffen Maercker]
To be able to reference labels that are loaded from a .lab file and stored in the model,
they have to appear in the ModulesFile. This method stores
label "labelName" = false;
definitions. As the actual state set information is directly stored in the model,
evaluating the label will result in the correct state set.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11740 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
7d9beeaf21
ExplicitFiles2MTBDD/import: fully load label information and attach to model [with Steffen Maercker]
In the same method, we also determine the initial states
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11739 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
5fc4ca16ef
symbolic models: allow attaching label state sets directly to the model (similar to explicit models)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11738 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
2d494dbeac
prism.ExplicitFiles2MTBDD: tidy JavaDoc, auto-close BufferedReaders [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11737 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
ef71f87d58
parser.ExplicitFiles2ModulesFile: automatic close for BufferedReader
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11736 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
d9a0216159
parser.ExplicitFiles2ModulesFile: make PrismComponent (tidy)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11735 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
76bf167c8e
Prism: activate model import from explicit files for the explicit engine (-import... switches)
For MDPs, this currently relies on MDPSimple, which is not necessarily the most efficient way
to read/store the imported models.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11734 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
541e995741
explicit.ExplicitFiles2Model: explicit model import
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11733 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
d4ffeac654
explicit.MDPSimple: more flexible buildFromPrismExplicit() [with Steffen Maercker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11732 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
edbb99fdb4
explicit.DTMSimple: use auto-close in buildFromPrismExplicit(), better error message (with Steffen Maercker)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11731 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
2c3d4a09e3
explicit.StateModelChecker: make loadLabelsFile static, use automatic close for BufferedReader
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11730 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
45466e9f1c
Minor refactoring (for branch synching).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11695 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
883fc69e23
Add "reach" option to -exportstrat (not actually used yet) [from Ganindu Prabhashana].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11691 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
49b363f3d4
Update usage message.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11688 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
6113f9bb0f
Make name of command-line executable (as displayed by -help message) configurable.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11687 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
09f85e67d0
Bug fix: Do not delete PEPA file after translation (especially if it is not a temporary file!)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11683 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
789654756e
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11682 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
fc881c0a2f
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11680 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
b02abe82d9
Assume Java 8 now when building distributions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11677 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
acc6287639
New convenience method in prism.Prism API for model checking a property specified as a string, with parsing done automatically.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11657 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
e1b22b5a9d
param/exact: warn if some probability/rate is zero in an update
The transitions are explored twice during model construction, once
to find the reachable states and the second time to actually build
the transition structure of the model. We suppress the warning
in the first pass so that it does not appear twice.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11656 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
31e0c86a5b
Code tidy: mark old PRISM API methods as @deprecated .
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11655 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
c20ce96c98
param/exact: filter zero probability updates so that they don't appear in the model
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11654 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
cc9585aa25
param: convert expressions to functions earlier in model building
Already convert the expression to a function for ChoiceListFlexi,
as this will allow filtering zero probability updates (next commit)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11653 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
777af75ee8
param.Dag: handle special functions (+/-inf, NaN) in fromBigRational and asBigRational
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11650 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
030aa4d0d8
ParamModel: support DOT output
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11649 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
ccdb02c5f2
ParamModel: provide getTransitionsIterator
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11648 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
f4ca1fbeb1
param.JasFunction.isConstant: actually return true for 0
The jas library returns false for the zero function...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11647 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
3d72a13cc3
Add .gitignore file (for now, for git mirror of the svn repo).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11645 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
6f4c9bf1e2
param/exact mode: Error if probabilities don't sum to 1 for some command (DTMC, MDP)
If we can can not guarantee that the probabilties for a command sum to 1 in a DTMC or
MDP then we report an error. This is similar to what happens for the explicit and
symbolic engines and fixes issue prismmodelchecker/prism#6 .
This error check can be switched off using the -noprobchecks option.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11644 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
ba83b581b6
param.Function: add isConstant() method
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11643 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
26ed5530a1
PrismCL, testing, regression: Don't try and run tests if not in test mode
Introduced in SVN 11637. We only want to run tests if test mode is actually active...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11642 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
e36324ce54
ParamModelChecker: use evaluateExact to determine the P/R operator bounds
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11640 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
b030d707eb
param: Wrap result as ParamResult, support testing (for single region result)
We wrap the RegionValues returned by ParamModelChecker in a ParamResult
object, which stores additional meta-information that allow for the
result to be tested.
In test mode, if there is only a single region, tests against the given
expected RESULT expression.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11639 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
b48a81827a
param.ModelBuilder: add getParameterNames() method
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11638 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
744907c3d1
PrismCL (test mode): run tests also in case of model build failures
Previously, model build failures skipped the tests and the corresponding
errors would not appear when running prism-auto in test mode.
Now, we just call doResultTest with the Result containing
the build exception for all the properties.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11637 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago