X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=Extractor%2FExtractorScript.py;h=3a87c2389d32699e6d6eba606e052981bf8211bd;hp=63f0111c98a89a4afe35dd15929cf10013f7754a;hb=752df0b3baa7349d6a0f5bdefb7d644a552bea2e;hpb=91baad001ce2d84cf5eb1b5d3f62ce90a6c8b0a2

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 63f0111..3a87c23 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -39,14 +39,14 @@ eventTypeCounterMap =  {'lock': 2,
 						'sunriseTime' : 1,
 						'acceleration' : 2,
 						'sleeping' : 2,
-						'goal' : 1,
-						'steps' : 1,
+						'goal' : 2,
+						'steps' : 2,
 						'color' : 1,
 						'colorTemperature' : 1,
 						'hue' : 1,
 						'saturation' : 1,
 						'energy' : 1,
-						'power' : 1,
+						'power' : 2,
 						'illuminance' : 1,
 						'humidity' : 1,
 						'alarm' : 4,
@@ -761,12 +761,28 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "goal":
-			event = open("eventSimulator/stepGoalEvent.groovy", "r")
+			#Write two events subsequently
+			event = open("eventSimulator/stepGoalHighEvent.groovy", "r")
+			for line in event:
+				extractedEvents.write(line)
+			event.close()
+			extractedEvents.write("\n\t\t\tbreak\n")
+			counter = counter + 1
+			extractedEvents.write("\t\tcase %d:\n" % counter)
+			event = open("eventSimulator/stepGoalLowEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "steps":
-			event = open("eventSimulator/stepStepsEvent.groovy", "r")
+			#Write two events subsequently
+			event = open("eventSimulator/stepStepsHighEvent.groovy", "r")
+			for line in event:
+				extractedEvents.write(line)
+			event.close()
+			extractedEvents.write("\n\t\t\tbreak\n")
+			counter = counter + 1
+			extractedEvents.write("\t\tcase %d:\n" % counter)
+			event = open("eventSimulator/stepStepsLowEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
@@ -796,7 +812,15 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "power":
-			event = open("eventSimulator/powerMeterEvent.groovy", "r")
+			#Write two events subsequently
+			event = open("eventSimulator/powerMeterHighPowerEvent.groovy", "r")
+			for line in event:
+				extractedEvents.write(line)
+			event.close()
+			extractedEvents.write("\n\t\t\tbreak\n")
+			counter = counter + 1
+			extractedEvents.write("\t\tcase %d:\n" % counter)
+			event = open("eventSimulator/powerMeterLowPowerEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()