diff --git a/prism/src/simulator/GenerateSimulationPath.java b/prism/src/simulator/GenerateSimulationPath.java index 3321982f..b88bad56 100644 --- a/prism/src/simulator/GenerateSimulationPath.java +++ b/prism/src/simulator/GenerateSimulationPath.java @@ -75,11 +75,11 @@ public class GenerateSimulationPath public void generateSimulationPath(ModulesFile modulesFile, Values initialState, String details, int maxPathLength, File file) throws PrismException { - parseDetails(details); this.modulesFile = modulesFile; this.initialState = initialState; this.maxPathLength = maxPathLength; this.file = file; + parseDetails(details); generatePath(); } @@ -126,6 +126,7 @@ public class GenerateSimulationPath throw new PrismException("Separator must be one of: \"space\", \"tab\", \"comma\""); } else if (ss[i].indexOf("vars=") == 0) { // Build list of indices of variables to display + VarList varList = modulesFile.createVarList(); simVars = new ArrayList(); done = false; s = ss[i].substring(5); @@ -136,7 +137,7 @@ public class GenerateSimulationPath s = s.substring(0, s.length() - 1); done = true; } - j = engine.getIndexOfVar(s); + j = varList.getIndex(s); if (j == -1) throw new PrismException("Unknown variable \"" + s + "\" in \"vars=(...)\" list"); simVars.add(j); @@ -146,7 +147,7 @@ public class GenerateSimulationPath s = s.substring(0, s.length() - 1); done = true; } - j = engine.getIndexOfVar(s); + j = varList.getIndex(s); if (j == -1) throw new PrismException("Unknown variable \"" + s + "\" in \"vars=(...)\" list"); simVars.add(j);