s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Bugfix: capitalisation in parametric settings. 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@7588 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 12 years ago
parent
978fe76739
commit
21b4fcf292
2 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      prism/src/param/ModelBuilder.java
  2. 22
      prism/src/param/ParamModelChecker.java

6
prism/src/param/ModelBuilder.java
View File

@ -188,11 +188,11 @@ public final class ModelBuilder {
*/ */
public void build() throws PrismException public void build() throws PrismException
{ {
if (functionType.equals("jas")) {
if (functionType.equals("JAS")) {
functionFactory = new JasFunctionFactory(paramNames, lower, upper); functionFactory = new JasFunctionFactory(paramNames, lower, upper);
} else if (functionType.equals("jas-cached")) {
} else if (functionType.equals("JAS-cached")) {
functionFactory = new CachedFunctionFactory(new JasFunctionFactory(paramNames, lower, upper)); functionFactory = new CachedFunctionFactory(new JasFunctionFactory(paramNames, lower, upper));
} else if (functionType.equals("dag")) {
} else if (functionType.equals("DAG")) {
functionFactory = new DagFunctionFactory(paramNames, lower, upper, dagMaxError, false); functionFactory = new DagFunctionFactory(paramNames, lower, upper, dagMaxError, false);
} }
long time; long time;

22
prism/src/param/ParamModelChecker.java
View File

@ -162,36 +162,36 @@ final public class ParamModelChecker
verbosity = settings.getBoolean(PrismSettings.PRISM_VERBOSE) ? 10 : 1; verbosity = settings.getBoolean(PrismSettings.PRISM_VERBOSE) ? 10 : 1;
precision = new BigRational(settings.getString(PrismSettings.PRISM_PARAM_PRECISION)); precision = new BigRational(settings.getString(PrismSettings.PRISM_PARAM_PRECISION));
String splitMethodString = settings.getString(PrismSettings.PRISM_PARAM_SPLIT); String splitMethodString = settings.getString(PrismSettings.PRISM_PARAM_SPLIT);
if (splitMethodString.equals("longest")) {
if (splitMethodString.equals("Longest")) {
splitMethod = BoxRegion.SPLIT_LONGEST; splitMethod = BoxRegion.SPLIT_LONGEST;
} else if (splitMethodString.equals("all")) {
} else if (splitMethodString.equals("All")) {
splitMethod = BoxRegion.SPLIT_ALL; splitMethod = BoxRegion.SPLIT_ALL;
} else { } else {
throw new PrismException("unknown region splitting method " + splitMethodString); throw new PrismException("unknown region splitting method " + splitMethodString);
} }
String eliminationOrderString = settings.getString(PrismSettings.PRISM_PARAM_ELIM_ORDER); String eliminationOrderString = settings.getString(PrismSettings.PRISM_PARAM_ELIM_ORDER);
if (eliminationOrderString.equals("arbitrary")) {
if (eliminationOrderString.equals("Arbitrary")) {
eliminationOrder = EliminationOrder.ARBITRARY; eliminationOrder = EliminationOrder.ARBITRARY;
} else if (eliminationOrderString.equals("forward")) {
} else if (eliminationOrderString.equals("Forward")) {
eliminationOrder = EliminationOrder.FORWARD; eliminationOrder = EliminationOrder.FORWARD;
} else if (eliminationOrderString.equals("forward-reversed")) {
} else if (eliminationOrderString.equals("Forward-reversed")) {
eliminationOrder = EliminationOrder.FORWARD_REVERSED; eliminationOrder = EliminationOrder.FORWARD_REVERSED;
} else if (eliminationOrderString.equals("backward")) {
} else if (eliminationOrderString.equals("Backward")) {
eliminationOrder = EliminationOrder.BACKWARD; eliminationOrder = EliminationOrder.BACKWARD;
} else if (eliminationOrderString.equals("backward-reversed")) {
} else if (eliminationOrderString.equals("Backward-reversed")) {
eliminationOrder = EliminationOrder.BACKWARD_REVERSED; eliminationOrder = EliminationOrder.BACKWARD_REVERSED;
} else if (eliminationOrderString.equals("random")) {
} else if (eliminationOrderString.equals("Random")) {
eliminationOrder = EliminationOrder.RANDOM; eliminationOrder = EliminationOrder.RANDOM;
} else { } else {
throw new PrismException("unknown state elimination order " + eliminationOrderString); throw new PrismException("unknown state elimination order " + eliminationOrderString);
} }
numRandomPoints = settings.getInteger(PrismSettings.PRISM_PARAM_RANDOM_POINTS); numRandomPoints = settings.getInteger(PrismSettings.PRISM_PARAM_RANDOM_POINTS);
String bisimTypeString = settings.getString(PrismSettings.PRISM_PARAM_BISIM); String bisimTypeString = settings.getString(PrismSettings.PRISM_PARAM_BISIM);
if (bisimTypeString.equals("weak")) {
if (bisimTypeString.equals("Weak")) {
bisimType = BisimType.WEAK; bisimType = BisimType.WEAK;
} else if (bisimTypeString.equals("strong")) {
} else if (bisimTypeString.equals("Strong")) {
bisimType = BisimType.STRONG; bisimType = BisimType.STRONG;
} else if (bisimTypeString.equals("none")) {
} else if (bisimTypeString.equals("None")) {
bisimType = BisimType.NULL; bisimType = BisimType.NULL;
} else { } else {
throw new PrismException("unknown bisimulation type " + bisimTypeString); throw new PrismException("unknown bisimulation type " + bisimTypeString);

Write Preview
Loading…
Cancel
Save