Joachim Klein
2ff89c09a4
prism-auto: color 'NOT TESTED' test result just like 'SKIPPED'
NOT TESTED is the result of a // RESULT: ? line in a property file
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11599 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
bf6858ee7c
param.BigRational: fix isInteger()
We have to compare the denominator to BigInteger.ONE instead of
BigRational.ONE...
Introduced in SVN 11554.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11596 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
52dc54df5b
ConstantList: methods for removing a constant definition
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11595 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
7cd20911e9
ast.Property: tidy comment
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11594 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
b76524422a
PrismCL: Error message if -param switch is given but there is no property to check
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11593 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
79e5f3b68d
prism-auto: don't expand to filename for exports if 'stdout'
PRISM recognizes the filename 'stdout' as special and exports
to standard output, so prepending a directory by prism-auto
does not make sense.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11592 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Joachim Klein
74a052a4ec
LTSFromDA: small optimization in getSuccessorsIterator(s,i)
We are based on a DA, so there is only a single sucessor and we need no deduplication.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11590 bbc10eb1-c90d-0410-af57-cb519fbb1720
9 years ago
Dave Parker
6598fbcfa0
Tidying + refactoring in param.SymbolicEngine for alignment with simulator.Updater, on which it is based.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11578 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3ae531c33b
Minor refactoring.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11577 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
e217d58339
Small comment fix
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11576 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3137e20217
Small comment fix
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11575 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7583585f99
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11574 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
6bcdc856c4
Allow .dot extension to be passed to the -exportmodel switch for export of graphical model in Dot format (less verbose and more obvious than -exporttransdotstates).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11572 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b7093533e5
Optimisation for PTA model checking where the initial state is a target - just return 1.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11571 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
43ffa810db
Catch invalid negative time bounds in PTA model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11570 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
76fd3b5e80
Bug fix for time-bounded probabilistic reachability in PTAs where the initial location is already a target (reported by Joachim Klein, Linda Leuschner).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11569 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
53036fa388
Property.checkAgainstExpectedResultString: Integer results in exact mode
Integer results are now also handled when using exact mode.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11558 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
e1105ab74a
Property.checkAgainstExpectedResultString: handle complex expressions
Instead of before, where only
// RESULT: integer
or
// RESULT: numerator/denominator
were allowed for result expressions, we now support arbitrary expressions
over the model/property parameters, e.g.,
// RESULT: 4.3*floor(q*3)
Caveat: Currently, there can be no whitespace in the expression...
Additionally, when model checking in exact mode, the expected value is
also computed using Expression.evaluateExact.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11557 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
2c8f5427b5
Expression: add evaluateExact methods
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11556 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
70e9e56a73
BigRational: add toInt() and toBoolean() methods
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11555 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
427844cfd1
BigRational: add isInteger method
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11554 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
f3d7e01c71
BigRational: add floor() and ceil()
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11553 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
48299632a1
BigRational: add from(other) static constructor
Currently, supports int, long, double, boolean and other BigRational
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11552 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
eca03981a0
param.BigRational: fix comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11551 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
6dda865f04
Change prism.parseSingleExpressionString calls to static access
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11550 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
678d1111cb
Prism: make parseSingleExpressionString a static method
Needed for subsequent use in Property for parsing RESULT expressions.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11549 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
d6e222a4e1
RESULT handling for Property: Invert order for picking RESULT
Now, the *first* RESULT that matches the model/property constants
is returned, previously it was the *last*. Inverting the order seems
to better match user expectations.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11548 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
aa3ec454a8
ConstantList: add constructor from Values object
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11547 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
69211a1c35
ConstantList: move initialisation to the variable definitions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11546 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
a8a3639ee7
NondetModelChecker: use more PrismNotSupportedExceptions instead of PrismExceptions
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11541 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
1621fb31c7
mtbdd/PM_NondetInstReward.cc: comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11540 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
7f48229dc1
Prism.modelCheckExact: Properly handle boolean results
Previously, a boolean result would lead to a ClassCastException:
prism prism-examples/dice/dice.pm -pf 'P>0.5[ F s=7 ]' -exact
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11538 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
0632eb656a
PrismCL: Catch unhandled Exceptions instead of delegating to default Java handling
We are now catching unhandled Exceptions and errorAndExit. Previously,
we relied on the Java handling, which would print the stack trace and kill
the main thread.
However, it seems that in the presence of thread pools (e.g., with the JAS
library used by param/exact model checking), an unhandled exception would kill
the main thread but not terminate PRISM. This could be triggered
e.g. with
prism prism-examples/dice/dice.pm -pf 'P>0.5[ F s=7 ]' -exact
which generates an unhandled ClassCastException and previously would make
PRISM hang indefinitely.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11537 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
eb017f950c
prism.SCCComputer: SanityJDD checks
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11536 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
36f4e3f81f
prism.ECComputer: SanityJDD checks
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11535 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
296f589631
JDD.isSingleton: fix broken computation
The computation did not actually check that
all the required variables actually occur...
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11531 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
4626d529a5
Code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11529 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
09c5b11a74
Bug fix in ConstructModel - do not call attachLabels in justReach mode.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11528 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
0e57919d0e
explicit engine: Properly signal "not supported" for MDP total reward computations
Previously,
prism prism-examples/dice/two_dice.nm -pf 'Rmax=?[C]' -ex
would yield a NullPointerException.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11522 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
bd9f2f255d
Add slightly more efficient implementation of getChoiceAction for PRISM models.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11508 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
41f4b886ce
Minor code tidy
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11507 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
50e13bca29
Add new getChoiceAction method to ModelGenerator interface, which is basically an alias for getTransitionAction(i, 0).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11506 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f76e72827e
Correct error in documentation for ModelGenerator interface.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11505 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
9fb9d0ae26
Bug fix in StateListMTBDD.getIndexOfState.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11484 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
9eff92431e
Bug fix in computation (and therefore display) of progress percentage during statistical model checking.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11475 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
e5b7f3297b
Symbolic engines: Clear ODD when clearing the model (fix memory leak)
Previously, the ODD data structure (for mapping between reachable states and their index)
on the C side was not deallocated when the model was cleared.
Closes https://sourceforge.net/p/prism-mc/bugs/9/
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11468 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
123734eeab
Infrastructure for deallocating ODDs
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11467 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
fba209b7f3
New getIndexOfState method in prism.StateList (not tested yet).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11462 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
8e38d2b7dd
Some tidying + documentation in prism.StateList classes.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11461 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
4cca315ef2
Add JDD.FindMinPositive (minimal positive terminal constant of an MTBDD)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11459 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago