X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=Extractor%2FExtractor.groovy;h=58721250259feda3219a7bb5d20cea79868c0193;hp=b5f3194425f6d6bf906b13a061898a77807d6e86;hb=659ecdb88d7f1396495812fea2573fd34bbf8d7d;hpb=976904577a2a985ce360227ea29f1cd9e4868703

diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy
index b5f3194..5872125 100644
--- a/Extractor/Extractor.groovy
+++ b/Extractor/Extractor.groovy
@@ -101,17 +101,21 @@ import Timer.SimulatedTimer
 @Field File extractedObjectsConstructorApp1 = new File("Extractor/App1/extractedObjectsConstructorApp1.groovy")
 @Field File extractedObjectsConstructorApp2 = new File("Extractor/App2/extractedObjectsConstructorApp2.groovy")
 
+//Set this to true for global-state variable conflict
+@Field assignDifferentModes = false
 @Field chooseMode = 0
 //Empty the files
 if (App == "App1") {
 	globalObjects.write("")
 	extractedObjectsApp1.write("")
 	extractedObjectsConstructorApp1.write("")
-	chooseMode = 0
+	if (assignDifferentModes)
+		chooseMode = 0
 } else if (App == "App2") {
 	extractedObjectsApp2.write("")
 	extractedObjectsConstructorApp2.write("")
-	chooseMode = 1
+	if (assignDifferentModes)
+		chooseMode = 1
 }
 
 
@@ -1642,12 +1646,16 @@ def input(LinkedHashMap metaData) {
 			//def randomVariable = Math.abs(new Random().nextInt() % 3)
 			def modes = ["away", "home", "night"]
 			// Always assign a different mode to each app
-			//def userInput = modes[1]
-			def userInput = modes[chooseMode]
-			if (chooseMode < 3)
-				chooseMode++;
-			else
-				chooseMode = chooseMode%3
+			def userInput
+			if (assignDifferentModes) {			
+				userInput = modes[chooseMode]
+				if (chooseMode < 3)
+					chooseMode++;
+				else
+					chooseMode = chooseMode%3
+			} else {
+				userInput = modes[1]
+			}
 
 			if (modeVariables == 0) {
 				mode0 = metaData['name']