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
Dave Parker
9ce7e6441b
Push containsUnboundedVariables methof from VarList up into ModulesFile.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10970 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f16da3762d
Add missing file from last commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10964 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
17087eee26
Decompose semantics checks (into expressions, models, properties). This will facilitate later attempts to make model checking less tied to ModulesFile specifically, rather than other model sources.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10963 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
8775d3a993
Small fix in Expression static constructors to make return types more clearly specified. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10959 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
557695e82b
Small refactor in SimulatorEngine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10946 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
4aea86b501
Comment clarifications.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10945 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
6a4e44b8ab
Small refactor in SimulatorEngine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10939 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b1cab85663
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10936 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
99fa6cf81b
Some commenting in SimulatorEngine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10930 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
400fcfcc45
Some refactoring in SimulatorEngine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10928 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
11cf431209
Auto-format.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10921 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7557171b82
Auto-format.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10918 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
15cbc73554
Tidying/commenting in GUI simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10915 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
e85cceb572
Small tidies/fixes in explicit engine MDP strat generation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10913 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
fb37c9a22d
Slight refactoring of strategy storage in explicit engine (to match PRISM-games).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10910 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
bb44582283
Set default values for some hidden options in PrismSettings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10905 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
87b50d7da2
Small change in ExpandPropRefsAndLabels: either properties list or lable list can be omitted (and is then ignored).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10901 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b1f83bfbf5
Small fix: slightly more efficient recursion in ExpandLabels and ExpandPropRefsAndLabels.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10899 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
c11bec58ab
SimpleLTL: refactor/protect simplify(), check that formula graph is actually a tree
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10898 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
59f44c56ee
SimpleLTL: isTree() check to ensure that graph structure is tree, not DAG
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10897 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
e3b49ea35f
SimpleLTL: add toDot() output of the syntax tree / DAG
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10896 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
ec84a58371
common.PlainObjectReference: For storing an object in a HashSet/HashMap, ignoring custom hashCode/equals
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10895 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
043c776914
Refactor ConvertForJltl2ba (fix regression due to custom equals/hashCode for ASTElements)
In SVN 10565, custom equals/hashCode methods were introduced for the
various ASTElements/Expressions, providing semantic equality. In the
implementation of ConvertForJltl2ba, a Hashtable was used to store
SimpleLTL formulas for the already handled Expression objects. With
the new equals/hashCode, this can lead to SimpleLTL formulas that
share subtrees, resulting in a DAG instead of a tree.
The SimpleLTL.simplify() function behaves incorrectly for DAGs, e.g.,
for "! (X (s1=7)) | (X (X s1=7))", producing wrong output formulas.
We refactor ConvertForJltl2ba to do a simple recursive transformation
from Expression-based LTL to SimpleLTL. Optionally, sharing of
identical subtrees can be enabled.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10894 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
90a79ce2d0
Some additional output during Pareto curve generation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10893 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b46a0c31be
Multi-objective Pareto curve calculation fix: more robust computation of extreme values when non-convergence is an issue.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10891 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
619b7d53c5
Re-enable disabled convergence check in multi-objective value iteration since it can give the wrong answer. Better fix follows.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10890 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b35a8d1553
Typo in output.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10889 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago