Joachim Klein
cbdcde36cb
GUISimPathFormulaeList: fix some warnings
8 years ago
Joachim Klein
0559014a2f
GUISimulator: harden against exceptions
(1) In general, for user actions (a_...), ensure that setComputing(false)
is called even if the underlying computing resulted in an exception.
This ensures that the buttons/menu items of the simulator are properly
enabled again and we don't get into a deadlock situation where we
can't even start a new path.
(2) For the automatic step actions, ensure that the path display is
updated even if there is an exception, as there may have been
intermediate steps that had succeeded before the error occurred.
8 years ago
Joachim Klein
737ad9cd22
GUISimulator: Fix "Simulate up to step x, backtrack x steps" handling for CTMC models
Previously, the resulting distance was considered as a time value,
not a step value. For discrete time models, this coincidently does
the right thing, but for continuous time models this does not work as expected.
Technically, as engine.getPathSize() is a long and the value from the text box
is an int, the result is a long and that leads Java to prefer the a_backTrack(double)
and a_autoStep(double) variants of these methods. We cast to an int to ensure
that the int-parameter variants are taken.
8 years ago
Joachim Klein
6c0294923e
Use exact evaluation of constant expressions in exact and parametric mode
Using the infrastructure from the previous commit, we request exact evaluation
of constants in exact and parametric model checking mode.
Additionally, note where we deliberately choose non-exact evaluation mode.
Add corresponding test cases.
8 years ago
Joachim Klein
abf37417fd
Fix JDK9 compilation issue, use parser.ast.Module instead of Module
In Java 9, there is a new system class java.lang.Module that is implicitly imported
everywhere and which clashes with the parser.ast.Module class, resulting in
compilation errors, as javac is not able to disambiguate between the two
automatically.
We are therefore more specific when referencing the PRISM parser's 'Module' class,
by using the full 'parser.ast.Module' name.
9 years ago
Dave Parker
c0e99cea6b
Error message typo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11913 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
c70922c329
GUISimulator, path formulae view: For P[ phi ] properties, display only the inner path formula phi
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11445 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
4f165146b1
GUISimulator: reactivate the display of path formulae in the corresponding simulator tab [reported by Steffen Märcker]
Currently, properties that contain an undefined property constant are not displayed.
In the future it might be nice for the user to be asked to specify these constants,
preferably in an unobstrusive way, so that these path formulae can be displayed and
evaluated as well.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11444 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
11cf431209
Auto-format.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10921 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
15cbc73554
Tidying/commenting in GUI simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10915 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
18cd16d78d
Code tidy (auto-format).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10866 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
85b7c30d4a
Catch possible null value in GUI simulator update table display (reported by Steffen Marcker).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10833 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
91d83d245b
Tidying GUI code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10408 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c2bc82b76c
GUI simulator fix: new path action triggers model parse if it had not been done (e.g. due to large models not auto-parsing).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10404 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
6b8bb831fb
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10403 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
02c26dbf53
Update simulator to allow path lengths over 2^31.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7785 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
37b6d72e7f
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7493 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
71b207746c
Remove confusing GUI question dialog.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7400 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
52e384b8c5
Undo some recent tidies to retain java 6 compatibility.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7252 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c769bb5ac0
Remove a few warnings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7181 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
86bd5a5d71
Small bug fix: missing err msg in GUI simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7180 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
ada9f0e3c7
Misc code tidy and warning removal.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6936 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
9673f00c6a
Miscellaneous code tidying + warning fixes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6927 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
aa807d3ab3
Small improvements to usability of the GUI simulator transition table.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6886 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
7af19279f6
GUI bugfix: NPE.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5481 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
57259f67c1
Updated version of Path Plot dialog, including specification of max path length.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5431 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
74717ecb9a
Updated version of Path Plot dialog, including specification of variables.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5430 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
b80badd54c
Shortcut for new path plot (Ctrl/Cmd-F8).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5428 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d528208cc7
Small GUI fixes: resets of warning counters.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5418 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e1e6267210
Move path plot thread to GUI to allow display of warnings/errors.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5412 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
6d502769be
GUI simulation path plot and can show vars and/or rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5400 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
9dc7609982
Changed/all-steps option in Path Plot Display dialog now respected.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5398 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
41ad029281
Default to "changes" in "plot path details" dialog.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5394 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
2b85d7307d
Tidy/fix double click detection in GUI simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5393 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
af37dc9864
Tidy/fix double click detection in GUI simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5392 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d0bf75014f
Improved "Path Plot Details" dialog.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5391 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d960bf8020
Better handling of errors in simulator calls from GUI.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5386 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
992c0864dc
New/improved simulation path plotting functionality.
For -simpath switch:
* paths are generated on-the-fly for efficiency where possible
* rewards are not displayed by default, use 'rewards' option to show
* new 'snapshot' option to only show states at certain time-points
For GUI simulator:
* basic functionality to plot existing paths or create new plots directly
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5384 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
bdd579d85d
New option in GUI simulator to plot path on a graph (all vars over time).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5360 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
178d3ca90e
SimulatorEngine only builds TransitionList on demand.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4958 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
3afdc1b708
Bugfix: loading new path into simulator should select end state of path.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4730 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
b3df07c192
Load model/prop labels when showing cex in GUI simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4728 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
1f4461da64
Ctrl -> Cmd in GUI on Macs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4176 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
61a161b0ec
Do not add loaded path properties to simulator (caused const evaluation bug found by Mateusz in PMC practical) and is not finished yet anyway.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4122 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
3d3108419b
Bug fix (again) - to compile on Java 7 (via some import tidying/fixes).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3524 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
0b65c69a6b
Added loadPath methods to SimulatorEngine and GUISimulator; not used currently.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3470 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
2f5de7b714
GUISimulatorPathTableModel reads from new PathFullInfo interface.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3467 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
f274604e0b
GUI bug fix (simulator). How did this ever work?
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3459 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
f3ae5d3b23
Refactoring/tidying/fixing GUISimulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3458 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
6b21b0543d
Added ModelType.probabilityOrRate() method, used in simulator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3447 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago