Dave Parker
f19c4238d3
Type conversion bug.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5389 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
5d37e99d57
Type tidying in castValueTo methods.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5388 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
07bf18a2f4
Fix makefiles with easier setup of classpath using * for jars.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4889 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
3c44acb8e1
Added new printall filter.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4750 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
2ec83e9296
Bug fix in reward struct print out - breaks digital clocks output with un-named rewards structs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4715 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
63162e41a3
Time-bounded properties with equal lower/upper bounds, e.g. P=?[ F[T,T] target ], can be specified as P=?[ F=T target ], for convenience.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4710 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
0b2f9a078f
Refactor explicit-files model import, splitting into two phases to allow addition of import for explicit engine later.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4694 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4a20773172
Better error message for unexpected non-exception.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4641 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
2a609cb942
Better error message for unexpected non-exception.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4640 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
1955392c65
Test mode can expect exceptions, e.g. using:
// RESULT: Error
It can also check for the presence of one or more words appearing in the error message, e.g.:
// RESULT: Error:non-positive,divisor
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4639 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e3846c7d21
Push some function evaluation code into separate methods, for easier re-use elsewhere.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4637 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
9d13945300
New toString method + comments in State.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4584 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
33204e0f64
Bugfix in Module deepCopy().
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4552 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
da0855d97d
Bug fix: deepCopy of SystemParallel doesn't copy actions - also means actions get lost in digital clocks translation (bug found by Arnd on BRP PTA).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4525 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
a3d99e62d0
Add property reference support to PTA ans approx model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4507 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
b870e550e7
Fixes/renames in property reference search code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4503 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
be53bceb72
Rename a few visitor classes
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4502 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
fd968a89d1
Check for cyclic dependencies in property references.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4501 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
ac31984b5a
Fix type checking for property references (and some autoformatting - oops).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4500 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
c7365ce0d9
Bugfix: look for undefined constants recursively in referenced properties.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4499 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
c7d1af5f85
More fixes for bugs introduced in recent "improvements" to constant handling API:
- setSomeUndefinedConstants(null) call changed in PropertiesFile
- expandConstants() handles undefined constants cleanly
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4460 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Vojtech Forejt
e3f6e64e7a
package-info.java is ignored in makefiles
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4380 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
148f2b814e
Fix in numerical value comparison for -test checks.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4310 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
086bb3243d
RESULT label for test properties can be NaN.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4305 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
854cd58edd
Typo in error message (old debugging info).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4250 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
95d7e89a57
Bugfix: previous "improvement" to API wrt undefined constants broke some models, e.g. when trying to evaluate pow/floor etc. with wrong number of arguments.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4249 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
7fda209763
Undo revision 4243 - alternative fix coming up
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4248 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Vojtech Forejt
b1ea8c04d4
Fixed handling of the case when functions like pow, floor, etc. are given incorrect number of arguments.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4243 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Vojtech Forejt
b1e27b40c5
added a missing class for handling named properties in the gui
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4114 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
a066e5db8e
Bugfix in handling of init/deadlock labels during constant processing - e.g. P=?[F "deadlock"&x=i] failed if i was a constant.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4085 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
bf59e25a49
Fixed a bug in getAllUndefinedConstantsRecursively. Showed up when running auto in embedded example. Bug found by Janne Kauttio.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3983 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
9e7ff7c43b
Makefile fix. Package parser.type may not get built in some scenarios.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3969 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
14025e109d
Improvements to StateValues class + it's use in explicit model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3581 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
3e8f246006
Typos in javadoc comments.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3550 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
3723afae6c
New isDefinedConstant methods (+ code tidy).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3437 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
d4ce4fa73c
Code doc
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3380 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
10313b7d02
Improved handling of undefined constants in properties files:
* don't need to provide values for all constants, just those required for model checking
And a few related bug fixes:
* in error handling for constants in PrismCL
* in export of labels from properties file with constants
And some small related API changes:
* don't need to call setUndefinedConstants on ModulesFile/PropertiesFile if there are no undefined constants
* more flexible UndefinedConstants classes
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3319 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
36e523c90a
Bugfix: bug added in recent changes to initial state creation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3300 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
26130c8d38
Correct types for initial state of ModulesFile (only a problem when there are clocks).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3298 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
af6eef0c49
Added castValueTo method to Type classes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3288 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
41f38a34fc
Added ability to have multiple RESULT test specifications for different constant values, e.g. "RESULT (x=1,y=2): 0.5".
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3285 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
f1bac71e5d
Improved doc for Values class + new toStringConcatenated method.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3284 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
cb49b36fc3
Bugfix: property handling in PTA model files fails (caused by inability to call tidyUp() twice in PropertiesFile).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3262 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
8bbda8f530
Added new expression evaluation methods (needed for explicit model checker). Unfortunately breaks some existing calls to evaluate(constVals, null) due to ambiguities. Need to replace them with evaluate(constVals).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3254 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
2654125531
* Check added to catch if the same variable is set twice in the same update
* New class of semantic checks created that are only done after constant definitions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3231 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
d0d92d3dc9
Code documentation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3230 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
a126367821
Simulator engine: Documentation of Choice object, remove some unused Choice methods, add some action-querying methods in SimulatorEngine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3212 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
6289094aa0
Property references can appear in properties (still a few TODOs though).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3186 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
3c8ca8495d
Added iff (<=>) to PRISM model/properties language.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3175 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
8465fdeb07
Property names parsed (but not used) and -test switch added (but no property/verify blocks yet).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3096 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago