Dave Parker
b5203f0f51
Some fixes in the way comments are displayed when exporting results (+ associated refactoring).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10156 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7881853f5d
Add "comment" option to -exportresult (and some small refactoring of -exportresult functionality in PrismCL).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10154 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
ee48209968
Create a new ResultsExporter class, connect it to ResultsCollection and use this from PrismCL (in some cases) to handle -exportresults.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10153 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
a298807d5d
Additional toString in Values class.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10152 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
36b792e54b
Add support for backwards reachability algorithm to solve PTAs .
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10134 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f82a7c84ad
Clean up output when avg time is shown as NaN. [from Joachim Klein; and the last commit]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10130 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
4f371d0a3e
Make sure doubles are printed/exported in UK locale (. not , for separator).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10129 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f2d1d8fed6
PrismNative: Use setvbuf() to set stdout to line-buffered.
By default, stdout is line-buffered when connected to a tty but
completely buffered when redirected to a file or piped to another
program. This makes it hard to get an accurate picture of the current
log output and state of a running PRISM instance by looking at a log
file or terminal output for something like 'prism ... | tee log-file'.
On the other hand, we don't want to call .flush() on the logs all the
time manually. By using setvbuf, we set stdout to line-buffered, i.e.,
it will be flushed automatically for every line-ending. By passing
NULL as the buffer pointer, we ask the libc to construct a buffer,
passing 1024 as a (reasonable) hint for the buffer size, even for long
lines.
[from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10127 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
0bf0e07bee
prism-auto fix: .args files should be read for .auto files too.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10126 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
04673cdd23
prism-auto: More debugging
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10125 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c4deebb663
prism-auto: Rename .test files as .auto files.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10124 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9a6bb057cf
Allow initial states list to be cleared in ModelExplicit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10119 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
6e84525c9b
Bug fix for label export refactoring in last commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10115 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
d5b3071679
Refactor symbolic labels export to match explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10114 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
fae4eb38d7
Add support for -exporttarget to explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10111 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
244ca04d6c
prism-auto: display diff command when export test fails.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10107 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
56f48fa2d2
Remove debug output
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10106 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
68960327c1
State.setValue returns a copy of the object (for chaining purposes).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10103 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
1eb73ab127
Update sparse engine adversary generation to include number of transitions in the tra file.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10092 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5942b9e977
prism-auto bugfix (when calling on a properties file).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10091 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
c8951a634a
prism-auto patch: Make name of "models" file configurable. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10090 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
abcb948d6f
prism-auto patch: make sure directories are traversed in a predictable order. [from Joachim Klein]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10089 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5173aab053
Bug fix in explicit.SCCComputerTarjan (from Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10088 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
ee3dae7be9
Add a remove() impl to AddDefaultActionToTransitionsIterator - Java 7 does not have a default implementation of this.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10084 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b5ad63323c
Code tidy: cleaner way to create empty iterators (thanks Steffen).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10082 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
9aae5befb4
DTMCFromMDPMemorylessAdversary gives actions from MDP.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10077 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5b8f3cd4d6
Add iterator to get actions from a DTMC (not usually stored, yet), defaulting them to null, and display these from exportToPrismExplicitTra().
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10076 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
7eef2a266c
Fix a few compiler warnings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10059 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5238c76c4c
Optimisation in the simulator for models with very large numbers of actions (from Marcus Daum + Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10057 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
be12b376dc
Bug fix in double_vector_to_dist (dv.cc) - did not bail out when there are too many distinct values due to overflow of short int counter. [found by Chris Dehnert]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10055 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
28cf06cd57
prism-auto: Revert -e/--echo switch to old behaviour and add --echo-full for extended functionality from Joachim Klein.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10045 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f7f7e736d2
prism-auto: Fix some bugs and document more of the functions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10044 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
835e95a861
Don't print optimal strategy to screen when exporting it (explicit engine).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10042 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
683f714edf
Small fix in LTSFromDA: successors might not be unique (spotted by Joachim Klein).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10041 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
f19cb029d7
Parse modifiers on R and S operators as well as P.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10037 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
7f1315dfc1
Do not allow any ExpressionQuant modifiers for now.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10035 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
8475ae29be
ExpressionQuant: mode -> modifier.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10034 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
adba5a090c
ExpressionQuant: mode -> modifier.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10033 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
1945ef1d40
More refactoring of ExpressionQuant and add "mode" field, currently ignored.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10032 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
5c8439c0e6
Convert ExpressionQuant from interface to abstract class and push some shared code in ExpressionProb/Reward/SS into it.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10031 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
86c3e3e3cc
New default for CUDD max memory (1GB) and more flexible usage of that setting: allow memory in format 125k, 50m, 4g, etc.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10028 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
b4f05f3cd0
Add possibility to specify type to -exportpropaut switch (dot or txt), e.g. -exportpropaut:dot dra.dot.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10018 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
37b4284bfd
DA can print to a PrismLog in either text or Dot format.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10017 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago
Dave Parker
8454511dad
DA can print to a PrintStream or a PrismLog.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10016 bbc10eb1-c90d-0410-af57-cb519fbb1720
11 years ago