Dave Parker
66ea7475a7
Optimisation when dealing with filters: perform cardinality check for "state" filters earlier. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11008 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
eda5876325
Minor refactoring, ahead of upcoming patches. [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11007 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0f2bbbc7b6
Add some (syntactic) reward info to the ModelInfo interface and use this where possible in explicit model checking. Can now use ModulesFileModelGenerator for reward property model checking. Also push constant info from ModelGenerator up to ModelInfo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11006 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0603e4a9b5
Some refactoring in explicit model checking engines: create new child model checkers, rather than inheriting their functionality as a subclass(e.g. DTMCModelChecker from CTMCModelChecker) - avoids problems where some methods are not implemented in the subclass.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10372 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
4a33c0398c
Add some more (hidden) settings to explicit StateModelChecker inheritSettings().
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10110 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
897ca7c4c1
Code re-arrange.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10109 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
bb1d0dcd5b
Add label export functionality to explicit engine
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10108 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
53c24c5abb
Add exportTarget settings to explicit model checkers (not used yet).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10105 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0984820760
Add support for -exportprodtrans and -exportprodstates switches to explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10104 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d0f3e91387
Some code tidying (automatic mostly) for merging purposes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10067 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b12953b937
Make use of the new PrismNotSupportedException.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9999 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0b05a40aec
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9957 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
be5cdf908a
Provide getConstantValues() for model checkers, allowing other classes to access the constants. [Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9596 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
797f9494b2
Explicit engine: Add BitSet statesOfInterest parameter to the various checkExpression... methods [Joachim Klein].
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9545 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b7864791dc
Store vector in Result during model checking if requested.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8402 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
fd55870fc6
Bug fix in previous commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8398 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
7a4b42efde
Add an (as yet unimplemented) option to Prism to store the vector of results during model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8396 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
f85400152d
Re-factoring - push the creation of default filters during model checking into a utility method in ExpressionFilter.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8394 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
81d8cad3aa
Better error message when trying to use "multi" function on models other than MDPs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8232 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
453342d5ba
Code tidy (remove warnings).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7636 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
17a222a59f
Typo.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7635 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
7fd5c495bd
Add labels to explicit models more cleanly and tidy code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7633 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
60b6307181
Add experimental bisimulation option (explicit engine, hidden option).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7630 bbc10eb1-c90d-0410-af57-cb519fbb1720
12 years ago
Dave Parker
df53058dd4
Typo in model checking message.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7267 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
c68d4a4946
Refinements to PrismComponent interface, and to explicit.StateModelChecker handling of settings (originally due to bug caused by calling overridable methods in explicit model checking constructors).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7200 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
54b9aea80b
Tidy up of symbolic/explicit SCC/EC computer classes, incl. integration of PrismComponent interface + knock-on effects.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7128 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
3e2efc21e9
New PrismComponent class: refactoring for various model checking components.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7125 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
5bd1087e06
Re-factor model checker creation in Prism class, and add getStrat setting.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6995 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
4ee9ed825e
Miscellaneous code changes/tidies - trying to align with prism-games a bit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6871 bbc10eb1-c90d-0410-af57-cb519fbb1720
13 years ago
Dave Parker
5018559d3e
DTMC steady-state computation for explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5617 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e05cab0dab
Static methods to create model checkers by type.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@5314 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
1935ae489f
Explicit mc setSettings methods ignore settings if null.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4942 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e8b1a26dfc
Add ? operator to explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4752 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4ce19b4bc4
Comments
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4751 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
19ef6934e8
More cases handled when cacheing filter info in (symbolic/explicit) model checkers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4684 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
43d52add46
Model checkers (symbolic/explicit) cache some filter info for optimisations/checks during model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4678 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e681ec2ae7
Remove old un-needed code in explicit model checking function.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4675 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8f00acc289
Finish up missing parts of explicit.StateModelChecker - no longer relies on evaluate()ing all states for missing operators.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4645 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
507e721b97
Bug fix in just-added code for explicit model checker.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4643 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
955e3c9aaa
Functions handled properly by explicit model checker.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4642 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4bd2319af1
Unary operators handled properly in explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4629 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
a218d09b2b
* Continued major changes to PRISM API
- keeps track of model, builds when needed
- takes care of explicit engine stuff too
* Changes to deadlock handling:
- new option for "fix deadlocks" (defaults to *true*) (and new switch -fixdl)
- consistent deadlock handling everywhere, incl. GUI and experiments
- changes to model-level deadlock storage (symbolic and explicit)
* Explicit engine added as true engine, also available from GUI
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4562 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
01b9f75f47
Fix in explicit model checker - remove dupe calls in bin-op check.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4509 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e9a1859339
Add binary operators to StateValues class and use in explicit model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3996 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
6a046b4431
Tidy/improve passing of settings to explicit model checkers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3708 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
995cdd3600
More printing options in StateValues (incl. state lists) + rest of filter stuff.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3594 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
3351288f3a
StateValues has an associated model in explicit engine; improved printing.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3592 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
c476f05eac
Partial implementation of explicit print filter.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3591 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
452f4f2338
More filters in explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3588 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago