Dave Parker
8c26fba334
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11085 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
f78b3437d6
ModelInfo: provide getVarIndex() and getVarName()
Default implementation relies on the getVarNames() method
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11079 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b6828a7045
Remove unused "techLog" from Prism object and other classes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11078 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
9b7737d1cc
Changing an undocumented feature (aka bug) where in the output Pareto curve, probabilistic properties came before reward properties. Now the output respects the order which user gave on input to multi(...)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11077 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
2d8194398b
Fixed a bug where the type of multi was not correctly determined if boolean arguments came before double arguments. Now we enforce doubles to be given first.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11076 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
934e3f24e0
Bug fix in new ModelGenerator usage: breaks on existence of system...endsystem.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11075 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
f4961ba4ed
Added an exception for the case when -lp is used for multi-objective, and there is a finite step bound. Up until now no warning was given and the step bound was ignored (treated as infinite)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11074 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
04d1c3efdc
StateModelChecker: remove mainLog field here, now stored in parent class PrismComponent
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11073 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
8d2199e0fe
prism.StateModelChecker: initialise PrismComponent from other StateModelChecker constructor as well...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11072 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
5332421dff
Comment typo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11071 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
9c1c80b2b0
prism.StateModelChecker: extends PrismComponent
This allows a (symbolic) model checker to serve as the parent PrismComponent
and provides access to the settings and log files whenever a ModelChecker
is available.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11070 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
6580cbdd79
PrismCL: Flush logfile on error
In errorAndExit, not flushing the logfile before exiting can result
in missing output when run in nailgun mode.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11069 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
4562006bb0
fixed multiobjective lp bug where the reward objective function was not set if there were no PCTL targets.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11065 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
bd73bc0857
Minor stdout cleanup
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11064 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
5e935c3a35
Propagating bugfix from rev @11061 to Pareto curve generation
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11063 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
85e6a903ba
Bug fix: Value iteration multi-objective was removing self-loops in situations where it should not be.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11061 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
303213e77b
ProbModelChecker: Fix reference leak when doing steady-state computation (MTBDD)
We have to clear the StateValues vector of the initial distribution
to avoid a reference leak when using the MTBDD engine. E.g., when
doing
prism prism-examples/dice/dice.pm -ss -mtbdd
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11060 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
f0b5b2ca0c
Bugfix for a case when the Pareto curve for minimising objectives contained (0,0) and the direction for a new hyperplane was not correctly computed
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11059 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
efff3c629b
Removing superfluous debugging output
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11057 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Vojtech Forejt
563d0bd772
Added capability for testing Pareto curves (no tests added yet, and the Pareto curve generation itself is still buggy)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11056 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
ccfaae3389
Add -exportmodeldotview switch (for now, hard-coded to use "dot" and "open" in path).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11055 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
a025ae2e07
Add model checking of R[C] operator for CTMCs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11041 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
ea537cc895
Expression.containsTemporalTimeBounds(): do not recurse into P/R/SS subformulas
Expressions such as
P=?[ X F P>0[F<=4 s=7] ]
were problematic before, as the LTL check for time bounds would recurse into the P-subformula
and complain without need.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11036 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
366660dac4
parser.visitor.ExpressionTraverseNonNested: Helper for traversing Expressions without recursing into nested P/R/SS formulas
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11035 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
4c13267ded
Add test methods for special cases in ExpressionLabels.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11028 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
f966f97d42
MultiObjModelChecker: fix DRA statistics typo in log output
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11020 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
d1468e2bd8
Fix recent changes to ExpressionFilter: lower case keywords got lost.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11019 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
bf59b2c9f7
Fix bug from new ModelInfo stuff: shows up when PropertiesFile model info is null (e.g. from GUI).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11017 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
dbac067052
Bugfix for last commit: filter op name got lost.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11016 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0d4ea5b904
Simplify parsing of filter operators in ExpressionFilter. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11015 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
4449ad4cd1
Further commenting in FilterOperator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11014 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
04d348fabd
Commenting in ExpressionFilter operators. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11013 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
de50d8d145
Small update to previous commit: display filter size *before* possibly optimising it.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11011 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
031a14e778
Small optimisation when model checking filters: Reduce set of filter states to the first state if filter is "first". [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11009 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
66ea7475a7
Optimisation when dealing with filters: perform cardinality check for "state" filters earlier. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11008 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
eda5876325
Minor refactoring, ahead of upcoming patches. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11007 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0f2bbbc7b6
Add some (syntactic) reward info to the ModelInfo interface and use this where possible in explicit model checking. Can now use ModulesFileModelGenerator for reward property model checking. Also push constant info from ModelGenerator up to ModelInfo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11006 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
2fe6c5d762
Add basic variable info to ModelInfo interface.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11003 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
c8a894cae2
Auto-format.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11000 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
6e20db3f60
Comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10998 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
388e8b5908
Add initial support to Prism API to load ModelGenerator objects + some associated changes in infrastructure + a test case.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10996 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
d4a86d5c2d
Remove ModelExplorer interface and replace with ModelGenerator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10992 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3def570e12
Small bug fix (triggered by exporting to dot after an auto-engine-switch).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10990 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
589b0b1a17
Remove defunct field from ConstructModel.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10982 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
e10b900018
Add Makefile target "count_loc" to display a count of lines of code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10979 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
9e18844a26
Bug fix in ModulesFileModelGenerator: need to make sure model constants are expanded in labels.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10977 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0e01288705
Improve explicit.ConstructModel: generalise to use new ModelGenerator interface (not just ModulesFiles via the simulator) and tidy up the settings within the class.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10976 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
a959beb7a7
Create ModelGenerator class for a ModulesFile object. Base code on existing stuff in SimulatorEngine, but do not remove anything from there.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10973 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7ff1ffe2db
Make ModulesFile implement new ModelInfo interface.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10972 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
89c80043df
Add new ModelGenerator interface (will eventually replace ModelExplorer interface). Also add ModelInfo superclass containing just some syntactic model info and a default implementation of the class for easier use.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10971 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago