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
Dave Parker
4ad686212f
Bug fix in ExpandLabels: missing deepCopy (only affects explicit engine currently).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3095 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
ce4b0beb1e
Undoing last commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3079 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
bcab165234
Use gcc-3 etc by default when building on Cygwin.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3078 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
be47ad30e8
Cleaner handling of model types in parser code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3042 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
d6bc7b263d
ModulesFile: getRewardStructByName method + cmment tidies.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3041 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
71ca9d28af
Final (pre-4.0) fixes to filters: added "state" filter, which gives result for a filter which must satisfy exactly one state, and make this the translation for old-style {state} filter.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2910 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
087ea5da6a
General tidy up of initial state handling in simulator, including a few GUI bug fixes. GUI default is to use the default initial state. For generation of simulation paths, there is a separate menu item to start from a specified state (and no option to switch asking on/off). Additional tidying and documentation in related parts of code too.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2835 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
37a11d25bd
Parser accepts unicode (e.g. in comments).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2830 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
4e2df081a9
Added -css switch to prism2html to allow override of style file location.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2829 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
1e083eb20d
Missing/broken copyright headers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2490 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
35f377ab3e
Improved documentation (JavaDoc mostly).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2436 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
07098cca94
Fix: inter-module var access allowed for digitsal clocks.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2421 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
53a5274cb3
Addition of new statistical model checking stuff (patch difference between trunk and prism-statmc branch at this revision).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2391 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
5dcbaab5eb
Header typo: author attrib.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2381 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
76d7039060
Code tidy: stop PrismExceptions on formula expansion (eases debugging) and remove an unused method.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2379 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
da822f4a6b
Code comments.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2378 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
e0aa53801e
Additional checks on where clock variables can appear in models.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2377 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
ecf0d8b082
Updated all parser files to new JavaCC (version 5.0) and removed getShortMessage() addition to ParseException.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2367 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
ac4cefbb45
Fix behaviour of old-style {min}{max} filters.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2330 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
2eb3538cd4
Allowed strict lower bounds in temporal operators (CTMCs only). Note: New parser classes generated due to new version of JavaCC.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2328 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
a04e766e04
Added -keywords switch.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2321 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
db60e6487b
Javadoc fixes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2260 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
0ba3191214
Add restrictions on which reward properties supported by digital clocks, and remove complaint about existence of both state/transition rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2248 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
248981743c
Better handling of filters, including ranges returned for multiple initial states.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2240 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
2e8a2d4b2e
Bug fix in integer power type checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2205 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
fbec092ace
Check for overflows added to simulator, but disabled for now.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2204 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
03cf76f5d6
Fix: floor/ceil of NaN/inf is an error.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2185 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
bf16bd754b
Correct handling of mod (error on non-positive divisor, positive result for negative dividend) (NB: needs CUDD fix too).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2182 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
904b3436b0
Correct detection of erroneous integer powers with negative exponent.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2181 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
ff697f7196
Correct detection of erroneous integer powers with negative exponent.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2180 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
bc834d7d83
Better property checks for PTAs, including new computation of prob operator nesting. Better handling of labels in PTA model checker.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2176 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Luke Herbert
cd94623574
In prism/Makefie
Added compiler flags for the Java compiler via a new alias JFLAGS. Note, that unlike the other compiler flags (e.g. CFLAGS) JFLAGS are applied by changing the the alias JAVAC="$(JAVAC) $(JFLAGS)" not by adding the flags alias to each call to the given compiler in called makefiles.
Added JFLAGS entries to build paths for all OS types (empty entries).
Added '-encoding UFT8' option to JFLAGS of CYGWIN build path
Added JAVACC compiler alias set by default to 'javacc'
Added simple check for javacc compiler in the users path.
Set JAVACC compiler name to 'javacc.bat' in the case of CYGWIN builds
In prism/src/parser/Makefile and prism/src/pta/Makefile
Changed calls to javacc to instead dereference the JAVACC alias
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2098 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
16781169f7
PTA fix: labels/rewards in models do not cause crashes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2068 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
bcd6110358
Simulator updates: fixed display of transitions in GUI, added (some) detection of deadlocks/self-loops. (And some tidying.)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2020 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
f0826d03e0
Bugfix in preproc due to PTA syntax checks.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1925 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
39150596a4
Semantic check for non-local variable access in PTAs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1893 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
9ce9901d91
Further work on simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1886 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
c3ba43e358
Further work on simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1883 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
17b4d063d1
Simulator supports labels
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1880 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago
Dave Parker
a653cd6239
Removal of debug output.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1871 bbc10eb1-c90d-0410-af57-cb519fbb1720
16 years ago