From 5570bbe2566236840f4e394b56a82e5b32f73c16 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Mon, 6 Jul 2015 11:24:28 +0000 Subject: [PATCH] Change -nobackward option to -nocachepre. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10195 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/ProbModelChecker.java | 13 +++++++------ prism/src/prism/Prism.java | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/prism/src/explicit/ProbModelChecker.java b/prism/src/explicit/ProbModelChecker.java index 0dcb96cb..020dfdfd 100644 --- a/prism/src/explicit/ProbModelChecker.java +++ b/prism/src/explicit/ProbModelChecker.java @@ -72,7 +72,8 @@ public class ProbModelChecker extends NonProbModelChecker protected boolean precomp = true; protected boolean prob0 = true; protected boolean prob1 = true; - protected boolean useBackward = true; + // Cache predecessor relation? (e.g. for precomputation) + protected boolean cachePre = true; // Direction of convergence for value iteration (lfp/gfp) protected ValIterDir valIterDir = ValIterDir.BELOW; // Method used for numerical solution @@ -212,7 +213,7 @@ public class ProbModelChecker extends NonProbModelChecker // PRISM_PROB1 setProb1(settings.getBoolean(PrismSettings.PRISM_PROB1)); // PRISM_USE_PRE - setUseBackward(settings.getBoolean(PrismSettings.PRISM_USE_BACKWARD)); + setCachePre(settings.getBoolean(PrismSettings.PRISM_CACHE_PRE)); // PRISM_FAIRNESS if (settings.getBoolean(PrismSettings.PRISM_FAIRNESS)) { throw new PrismNotSupportedException("The explicit engine does not support model checking MDPs under fairness"); @@ -346,9 +347,9 @@ public class ProbModelChecker extends NonProbModelChecker /** * Set whether or not to use precomputed Pre relation */ - public void setUseBackward(boolean useBackward) + public void setCachePre(boolean cachePre) { - this.useBackward = useBackward; + this.cachePre = cachePre; } /** @@ -432,9 +433,9 @@ public class ProbModelChecker extends NonProbModelChecker return prob1; } - public boolean getUseBackward() + public boolean getCachePre() { - return useBackward; + return cachePre; } public ValIterDir getValIterDir() diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java index 5846c8c4..7c03d98d 100644 --- a/prism/src/prism/Prism.java +++ b/prism/src/prism/Prism.java @@ -776,9 +776,9 @@ public class Prism extends PrismComponent implements PrismSettingsListener return settings.getBoolean(PrismSettings.PRISM_PROB1); } - public boolean getUseBackward() + public boolean getCachePre() { - return settings.getBoolean(PrismSettings.PRISM_USE_BACKWARD); + return settings.getBoolean(PrismSettings.PRISM_CACHE_PRE); } public boolean getFairness()