Joachim Klein
2c8f5427b5
Expression: add evaluateExact methods
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11556 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
d6e222a4e1
RESULT handling for Property: Invert order for picking RESULT
Now, the *first* RESULT that matches the model/property constants
is returned, previously it was the *last*. Inverting the order seems
to better match user expectations.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11548 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
aa3ec454a8
ConstantList: add constructor from Values object
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11547 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
69211a1c35
ConstantList: move initialisation to the variable definitions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11546 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
e165b9f9a6
refactor testing against PrismNotSupportedException
If the expected result specified via // RESULT
is an error, we treat a PrismNotSupportedException just
as any other ordinary exception. This allows verifying
the content of a PrismNotSupportedException error message.
Otherwise, we do the usual special handling as before.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11173 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
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
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
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
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
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
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
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
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
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
c373555f9c
Refactoring multi-objective code: readying for allowing lists of objectives in strategy operator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10849 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
cec60108c2
Comment clarification.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10845 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
ce6131636e
Some refactoring of the RelOp and ModelType enums. [from Steffen Marcker]]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10616 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
1097ecaaeb
Add a second syntactic co-safe-ness check, which first converts to positive normal form.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10611 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7f3862e636
Minor refactoring (allow PrismLangException to thrown instead of PrismException). [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10606 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f4bc0ee72c
Add equals and hashCode methods to Expression class hierarchy (Eclipse auto-generated).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10565 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
a9456fa826
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10564 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0d5cc45f53
Bug fix in the check for syntactic co-safe LTL formulas: implication/iff not allowed.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10555 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
5145992646
Bug fix in Expression.isPositiveNormalFormLTL: do not assume type checking has already been done.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10540 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
81f73d19d7
Bugfix in new SimpleLTL-to-Expression method.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10539 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
fe305344df
Utility function to create an Expression from an LTL formula represented as a jltl2ba SimpleLTL object (i.e., the reverse of Expression.convertForJltl2ba()).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10538 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
795627c953
Add partial support for multi-objective queries expressed as Boolean expressions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10456 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d44e1c7ecc
Bug fix in Coalition copy constructor.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10455 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d07055efa6
Copy updated Coalition class from prism-games.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10417 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
00cc653f68
Make a note that R_C is deprecated.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10345 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
17a946783d
Disallow properties of the form R[F<=k].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10343 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
69c8b2ce1f
Bug fix: better detection of R[F] when seeing if it is cosafe.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10338 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
812930e490
Comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10330 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b1c31f56e1
Utility methods for detecting syntactically cosafe LTL.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10329 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9f6777bed5
Regression tests: detect and warn about spaces in Error RESULT specifications.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10262 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
e73a7b2fb5
Undo regression test change: Error RESULT specifications cannot contains spaces (causes problems on specs with comments).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10261 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
30bec11226
Regression tests: Case-insensitive checks when comparing Error RESULT specifications.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10260 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
cdbc634b26
Regression testing: allow spaces in "Error" RESULT specifications.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10259 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c7d8a01190
Fix JavaDoc bugs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10218 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
2dc4ef9a4a
Fix JavaDoc bugs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10217 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f1ce23b1b4
Simplify/iimprove checking of rational results: can convert doubles.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10213 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago