Dave Parker
acd8ea491c
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4565 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
7ee82b3b13
Push exportprism and exportprismconst options from PrismCL into Prism.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4564 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8f45a5d491
Some refactoring.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4563 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
ee833dff89
Test commit
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4554 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d8bdbdc016
Test commit
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4553 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
33308db4c5
Change PrismCL to start using (some of) new Prism API. Also various tidying/simplifying/commenting.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4534 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
772b67c312
Add printBuiltModel{Stats,Info} to Prism API.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4530 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d21851ca8e
Add clearBuiltModel to Prism API.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4529 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
0304847a5d
Compile fix for previous commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4528 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
9cbb2afe2b
Change to Prism.java API: it now retains info about the model for later use. In particular, explicit building of the model and then passing the model back in is not required. Model building is done as needed. The old API is also retained (more or less), implemented using the new one. Also, major tidying and commenting in PRISM class.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4527 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
53a05282fa
Bug fix: PTA model checking using games should complain about not supporting system...endystem.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4526 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
5e93bc9a33
Prism class tidying and commenting.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4524 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
003505bf61
Slight tidy/re-arrange in Prism.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4523 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
6ee93d72ca
Slight tidy/re-arrange in PrismExplicit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4522 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
e702f606a2
Slight tidy/re-arrange in Prism.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4521 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4c40047b47
Version num
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4520 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4f1eff5ea6
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4519 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8f08dd6f37
Remove VERSIONS from installers.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4518 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d784a87caa
Remove VERSIONS.txt - just use CHANGELOG.txt from now on.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4516 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
7aed4f4cc0
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4513 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
b61936def6
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4512 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4e624deae1
Bug fix in 1D matrix export
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4511 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4e09eb136f
Added options to -exportresults switch for csv/matrix result export mode, and removed temporary switches -exportresultsmatrix, -exportresultscsv, etc.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4510 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
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
06ecdf6139
Copyright header updates
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4504 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
d583b461c8
Fix: make use of propertiesFile.getPropertyObject method.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4498 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
4fc61415fb
Display notification of warnings after computations in GUI.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4497 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
52b54d55fc
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4496 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
51807e044e
Add -pf as a command-line switch alias for -pctl/-csl and add .props as a properties file extension (in GUI).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4495 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
c8c4913a89
Switch remaining warning messages to new PrismLog.printWarning method.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4489 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d8c06edca8
Makefile tweak re tests target (from prism-games).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4485 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
18704d0e03
Bug fix in creating reward structures in explicit engine (from Hongyang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4482 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
3bcc43c3a2
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4481 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
b014058c62
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4479 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
ce6e0d8c0d
Disable start-up warning messages about unknown options in .prism file.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4478 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
97164d019b
Small bug fix (for something that wasn't really broken, but pointed out on forum).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4477 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d68813b865
Added -exportresultscsv and -exportresultsmatrixcsv to command-line
(but might change these names later).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4476 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
d7e06f569e
Improvements/fixes to export of results in matrix form:
- header now printed for 1D matrix (only 1 const)
- no extra column for 1D matrix
- matrices preceded by constant values/index names
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4475 bbc10eb1-c90d-0410-af57-cb519fbb1720
14 years ago
Dave Parker
8d1cd55711
Fixes/improvement/consistency for results export.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4474 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