Dave Parker
be08c7ff94
Formatting (for synch with prism-qar).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3389 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
16a8c710ae
More re-arranging of explicit rewards (from prism-qar).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3388 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
a92df6c3b7
Small fixes in explicit rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3385 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
385de74b06
Some tidying in explicit model construction.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3381 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
b55493f943
Method to buld rewards for arbitrary (explicit) models.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3377 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
c79d0ccafb
Small fixes in explicit rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3375 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
7a07921f76
Comments
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3373 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
80b693fee8
Added state rewards into MDP model checking in explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3372 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
e8e1a403b9
Bug fix in MDPRewardsSimple.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3371 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
075822347e
Reward constrcution for explicit engine pushed into separate class, and added state rewards for MDPs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3370 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
a539e72e57
MDPSimple bug fix (from prism-qar).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3368 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
4d56c43157
Small fixes in explicit action construction.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3364 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
15de6c029c
Fix in explicit model construction: allow distinct MDP choices that differ only by action name.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3362 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
e5b7ad597e
Expansion of transition-matrix-export functionality for explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3357 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
42338f803c
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3333 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
25b8626a51
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3331 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
3403e8b417
Some bugfixes and adds in explicit MDP classes, mainly relating to action labels.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3330 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
edab23b581
More updates to explicit library:
* removed some old rewards code from explicit models
* (and temporarily disabled a few things in PrismSTPGAbstractRefine accordingly)
* added method addActionLabelledChoice to MDPSimple
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3325 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
687feda2ef
Vojta - copyright and acks.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3324 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
b8a78c4031
Updates to explicit engine from prism-qar (Vojta):
* new rewards code for STPGs
* additional utility methods
* strip out some old reward stuff
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3323 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
24caab6c97
Credit/copyright for Christian von Essen.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3290 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
e33c2b1301
Added action names to other MDP explicit exports (dot, PRISM lang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3281 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
ac4eac3719
Action names included in explicit MDP export to tra file (from prism-qar).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3280 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
0728db06cf
Explicit engine reward construction handles model constants properly.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3255 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
d207970473
Some proposed changes to explicit.rewards classes (from prism-qar).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3250 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
e3549400e6
Changed storage/evalation of constants in explicit model checker to fix some bugs and allow calls to checkExpression to handle constants.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3242 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
b93cfa932b
Partial support for explicit engine DTMC steady-state computation.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3227 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
85147f1a71
Explicit engine improvements, mainly MDP rewards:
* Explicit engine gets MDP rewards (transition rewards only) from the model
* Rewards detached from MDPs (but attached ones still available, e.g. for A-R)
* Various bug fixes in MDPSparse, especially wrt rewards
* Few code tidies
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3215 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
cce9f00f4f
Bugfix: action names in explicit model construction.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3214 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
d061af7deb
More rewards handled in explicit engine: state rewards for Markov chains.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3208 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
ea14a0a7b6
Explicit engine: better error reporting of some unsupported properties.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3207 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
1c33e4b551
Explicit engine: better error reporting of some unsupported properties + support for property references.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3205 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
007786e74e
Re-enable MDPSparse in the explicit engine by default.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3137 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
c87aa97ade
Removing accidental part of last commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3135 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
6166413a20
Bug fixes in explicit expected reward on embedded DTMCs from CTMCs.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3134 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
41fb874956
Explicit engine Gauss-Seidel enabled for CTMCs too.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3133 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
57010fcda6
Time-bounded CSL model checking for CTMCs in explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3132 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
70847cecd0
Bugfix in just committed "and" operation in explicit model checker.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3131 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
99566fce64
Explicit model checker handles "and" directly, not via evaluate().
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3130 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
1a21d7f342
Explicit engine handles "deadlock" and "init" labels, if not embedded in a (logical) expression.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3124 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
f0639dbf36
Comments
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3118 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
785df07b63
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3116 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
e5e3b3066d
Comment
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3115 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
4ec5f0f9ae
Transient probability computation in explicit engine + some connection to CL.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3110 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
89596130f1
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3106 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
1d86f7680a
One more setting (max iters) passed to explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3094 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago
Dave Parker
52d2d21447
Update to newest version of explicit code (from prism-qar) plus -explicit switch for command-line and MDP solution settings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3047 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
5c0e7cd4f8
Broken copyright header.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2492 bbc10eb1-c90d-0410-af57-cb519fbb1720
15 years ago