From 53db5959d1d918b9972e694a20878b1fb2e64bd2 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Wed, 13 Apr 2011 21:48:01 +0000
Subject: [PATCH] Bugfix: vars option in -simpath was broken in new new
 simulator.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@2767 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/simulator/GenerateSimulationPath.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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<Integer>();
 				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);