Dave Parker
4ee20e5583
Bug fix in lifting reward structures to a product model (when there are some states with no transition rewards).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10750 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
c143d38707
Makefil fix: Pass location of ngprism for tests/testslocal targets.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10728 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b44b789235
Parent dir Makefile file.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10723 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0b04c50ea5
Auto-format (for merging purposes).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10717 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
5ce657090b
Make tool name ("PRISM") configurable.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10715 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b789d5ed56
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10713 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
4c88a8185c
Generalise parent directory Makefile to allow easier building from PRISM extensions such as PRISM-games.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10694 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7456dbf2fe
CHANGELOG.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10688 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f8e4f427bc
Refactoring of to-PRISM language translations: addition of PrismLanguageTranslator abstract class (preliminary version of) and connection with SBML/reactions/PEPA translators. Also, add support for SBML import to Prism class (but not used elsewhere yet).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10687 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
69b2ed1f08
Makefile tests targets use Nailgun.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10622 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
ce6131636e
Some refactoring of the RelOp and ModelType enums. [from Steffen Marcker]]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10616 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
11c1a65260
Allow wider ranger of co-safe LTL formulae inside an R operator (more precisely, those that can also be rewritten into co-safe form).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10614 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
04ba6cbe1e
Allow wider ranger of co-safe LTL formulae inside an R operator (more precisely, those that can also be rewritten into co-safe form).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10613 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7511a39939
Additional functionality in LTL parser test code.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10612 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
1097ecaaeb
Add a second syntactic co-safe-ness check, which first converts to positive normal form.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10611 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
2c6fece3d9
Auto-format
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10610 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f85e2cfa85
Remove some unnecessary exception throwing from functions in BooleanUtils.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10609 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f7e4b6f747
Comment typo
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10608 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
7f3862e636
Minor refactoring (allow PrismLangException to thrown instead of PrismException). [from Steffen Marcker]
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10606 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
31877c0f2d
Small refactoring in DTMCExplicit: cleaner implementation of iterator.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10605 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b7f3871fd7
Fix for SCC export on MDPs (and new underlying methods for computing/storing transition relation).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10604 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
7e28e62317
Refactor timeout: conversion in PrismUtils, now additionally supports days (d) and weeks (w) for long-term model checking
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10603 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b7a034bb85
Remove changes accidentally commited in rev 10595.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10599 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
fca843737f
Frivolity reduction ;)
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10598 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
95fab44a03
First try at a timeout mechanism (undocumented at the moment) for command-line PrismCL.
-timeout 5 5 seconds
-timeout 5s 5 seconds
-timeout 1m 1 minute
-timeout 1h 1 hour
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10597 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
70a48835ad
Bug fix in CNF conversion (from Yuyang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10596 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0f9e001645
Bug fix in CNF conversion (from Yuyang).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10595 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
5156f2d9c5
Fix in previous improvement to prism-auto.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10594 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
33e745af83
prism-auto: Location of ngprism can optionally be specified with --ngprism.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10593 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
6dd6628f52
Preliminary Nailgun support for prism-auto (add --nailgun).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10592 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
2026632c37
ngprism: Allow the use of "ngprism stop" to kill the server.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10591 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0cc899aad4
ndprism executable: tidy Makefile and disable building on Windows (Cygwin) for now.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10590 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
ff49cfd2a6
Add Nailgun jar, missing from last commit.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10589 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
3464a921ad
First version of Nailgun support built directly into PRISM. Adding switch -ng when running prism will instead start a Nailgun server ready to run PRISM instances, and running ngprism runs PRISM as a Nailgun client.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10588 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
2119ef3f85
Slight tweak to LTL test in parser.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10583 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
eeddcf9039
Add hasTransitionRewards() method to explicit Reward interface.
Currently, the main use is to determinie whether a MDPRewards has
any transition rewards.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10579 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
5d33639dd7
explicit.LTLModelChecker: Comment whitespace
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10578 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
423d169552
Symbolic LTLModelChecker: Provide constructDAForLTLFormula, use in ProbModelChecker and NondetModelChecker
Mirrors the recent refactoring in the explicit engine.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10577 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
298266c1cd
explicit.LTLModelChecker: construct a VarList for the Model-DA product if the model had a varlist
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10576 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
35461f5e2f
explicit: setVarList() / getVarList() for the explicit models
Mirrors the corresponding infrastructure for he symbolic models
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10575 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
7d049a979d
PrismLog: implement Closable / AutoClosable [with Steffen Maercker]
This allows for PrismLogs to be used in
try (PrismLog log = ...) {
...
}
blocks (Java 7 style resource blocks). When leaving the try block,
the log is automatically closed. This can be helpful in long-running
processes to get a look at a PrismFileLog output, as closing the log
forces a flush as well.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10574 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
152031aff5
Symbolic, BSCC computation: Omit BSCC size output when there are >10 BSCCs
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10573 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
fd5c1c90d8
ECComputerDefault: optimize by using BitSet.isEmpty() instead of BitSet.cardinality() == 0
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10572 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
307e8b586f
lpsolve5j.cpp: Fix deletes
The Java wrapper around the C++ lpsolve library uses the construct
delete a, b, c;
in several locations. The apparent goal is to delete all the pointers,
however the semantics of the C++ comma operator intervene: Only the
first pointer is deleted.
It looks like the relevant locations are never reached from PRISM code,
so we fix it mostly to silence the compiler warnings.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10571 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Joachim Klein
3da87f5bf5
prism-auto: support multiple -x arguments
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10570 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
b4a1fc0b79
Code tidy (auto-format).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10567 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
f4bc0ee72c
Add equals and hashCode methods to Expression class hierarchy (Eclipse auto-generated).
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10565 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
a9456fa826
Code tidy.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10564 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
9493710a0f
Add some additional functionality to the LTL test mode of PrismParser.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10563 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago
Dave Parker
0d5cc45f53
Bug fix in the check for syntactic co-safe LTL formulas: implication/iff not allowed.
git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10555 bbc10eb1-c90d-0410-af57-cb519fbb1720
10 years ago