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
11 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
11 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
11 years ago
Dave Parker
f95f76ab81
Bugfix in PRISM-to-Latex translation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10853 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 years ago
Dave Parker
cec60108c2
Comment clarification.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10845 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d4c5fd4fd5
Remove accidental commits
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10816 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
ff05caf158
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10815 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 years ago
Dave Parker
7511a39939
Additional functionality in LTL parser test code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10612 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 years ago
Dave Parker
2c6fece3d9
Auto-format
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10610 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f85e2cfa85
Remove some unnecessary exception throwing from functions in BooleanUtils.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10609 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f7e4b6f747
Comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10608 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 years ago
Dave Parker
70a48835ad
Bug fix in CNF conversion (from Yuyang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10596 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0f9e001645
Bug fix in CNF conversion (from Yuyang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10595 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
2119ef3f85
Slight tweak to LTL test in parser.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10583 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 years ago
Dave Parker
a9456fa826
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10564 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9493710a0f
Add some additional functionality to the LTL test mode of PrismParser.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10563 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 years ago
Dave Parker
8dbdce2e91
Test code for LTL formulas in PrismParser.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10554 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7da07f7b99
Small refactor in positive normal form conversion.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10553 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0c2e16ec32
Add conversion to positive normal form for LTL as well as boolean expressions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10552 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
e140741c0a
Remove unused method from BooleanUtils.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10550 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
11 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
11 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
11 years ago
Dave Parker
e2d1f0af25
Bug fix in CNF conversion.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10461 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 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
a6003f8216
Allow <<>> operator for MDPs (but not checked properly yet).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10419 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
fa9b601faf
Update parser to allow proper <<>> or [[]] syntax.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10418 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
234fe87e31
Fix parser tweak from previous commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10364 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
cfa767ec0d
Parser tweak to avoid ambiguities with S operator inside an R (now that LTL formulae are allowed).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10361 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
a76b3c73bd
Remove (most) usage of R_F in temporal operators.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10344 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
957148215e
Support (symbolic/explicit) for expected reward to satisfy a co-safe LTL formula.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10334 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b037bdf604
Missing file from last commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10333 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
a42e4108ee
More locale setting for outputting decimals in English.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10233 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago