From c2e86b5d2f8d69590e37b39af0e691f4704df6cd Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Sat, 22 Jul 2017 12:21:09 +0000 Subject: [PATCH] (interval iteration) total reward computation is not supported yet, throw error message git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12154 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/DTMCModelChecker.java | 4 ++++ prism/src/explicit/MDPModelChecker.java | 3 +++ prism/src/prism/NondetModelChecker.java | 4 ++++ prism/src/prism/ProbModelChecker.java | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/prism/src/explicit/DTMCModelChecker.java b/prism/src/explicit/DTMCModelChecker.java index da3db0b9..aef58b00 100644 --- a/prism/src/explicit/DTMCModelChecker.java +++ b/prism/src/explicit/DTMCModelChecker.java @@ -349,6 +349,10 @@ public class DTMCModelChecker extends ProbModelChecker int n, numBSCCs = 0; long timer; + if (getDoIntervalIteration()) { + throw new PrismNotSupportedException("Interval iteration for total rewards is currently not supported"); + } + // Switch to a supported method, if necessary if (!(linEqMethod == LinEqMethod.POWER)) { linEqMethod = LinEqMethod.POWER; diff --git a/prism/src/explicit/MDPModelChecker.java b/prism/src/explicit/MDPModelChecker.java index 37abb97c..be909905 100644 --- a/prism/src/explicit/MDPModelChecker.java +++ b/prism/src/explicit/MDPModelChecker.java @@ -1931,6 +1931,9 @@ public class MDPModelChecker extends ProbModelChecker mdpSolnMethod = MDPSolnMethod.GAUSS_SEIDEL; mainLog.printWarning("Switching to MDP solution method \"" + mdpSolnMethod.fullName() + "\""); } + if (getDoIntervalIteration()) { + throw new PrismNotSupportedException("Interval iteration for total rewards is currently not supported"); + } // Start expected total reward timer = System.currentTimeMillis(); diff --git a/prism/src/prism/NondetModelChecker.java b/prism/src/prism/NondetModelChecker.java index d0ee0cfa..3b2b292a 100644 --- a/prism/src/prism/NondetModelChecker.java +++ b/prism/src/prism/NondetModelChecker.java @@ -2185,6 +2185,10 @@ public class NondetModelChecker extends NonProbModelChecker // Local copy of setting int engine = this.engine; + if (doIntervalIteration) { + throw new PrismNotSupportedException("Interval iteration for total rewards is currently not supported"); + } + // Start expected total reward mainLog.println("\nStarting total expected reward (max)..."); diff --git a/prism/src/prism/ProbModelChecker.java b/prism/src/prism/ProbModelChecker.java index 32897ab6..6f6d8fe0 100644 --- a/prism/src/prism/ProbModelChecker.java +++ b/prism/src/prism/ProbModelChecker.java @@ -1727,6 +1727,10 @@ public class ProbModelChecker extends NonProbModelChecker JDDNode notInBSCCs = null; int numBSCCs = 0; + if (doIntervalIteration) { + throw new PrismNotSupportedException("Interval iteration for total rewards is currently not supported"); + } + // Compute bottom strongly connected components (BSCCs) SCCComputer sccComputer = prism.getSCCComputer(model); sccComputer.computeBSCCs();