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 |
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 |
Dave Parker
|
6b4125b1bd
|
Tidy up and improve checking of rational results
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10212 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
862d605ac5
|
Some basic checking of rational results
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10210 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
1d6d52f9a7
|
Export results in "comment" mode now also shows values of non-ranging contants.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10176 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
e90e072eee
|
Error message typos.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10167 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
a298807d5d
|
Additional toString in Values class.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10152 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
68960327c1
|
State.setValue returns a copy of the object (for chaining purposes).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10103 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
f19cb029d7
|
Parse modifiers on R and S operators as well as P.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10037 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
7f1315dfc1
|
Do not allow any ExpressionQuant modifiers for now.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10035 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
8475ae29be
|
ExpressionQuant: mode -> modifier.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10034 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
adba5a090c
|
ExpressionQuant: mode -> modifier.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10033 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
1945ef1d40
|
More refactoring of ExpressionQuant and add "mode" field, currently ignored.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10032 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
5c8439c0e6
|
Convert ExpressionQuant from interface to abstract class and push some shared code in ExpressionProb/Reward/SS into it.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10031 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
88928e8b89
|
New PrismNotSupportedException, to be throw when a model/prop/engine combination is not supported. Displays as UNSUPPORTED, not FAIL, in test mode. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9998 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
bb6693f43d
|
Allow comments to have no trailing new-line (e.g. when occurring at very end of file) - cannot see a good reason not to allow this.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9851 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
38f0e001c2
|
Bugfix in PrismParser.isKeyword (leading to incorrect identification of bad identifiers in SBML/reactions to PRISM translation).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9733 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |
Dave Parker
|
e02281dc86
|
Add Expression.isPathFormula(). [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9599 bbc10eb1-c90d-0410-af57-cb519fbb1720
|
11 years ago |