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

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 63f0111..2c96590 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -39,16 +39,16 @@ 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,
+						'humidity' : 2,
 						'alarm' : 4,
 						'contact' : 2,
 						'status' : 3,
@@ -56,10 +56,11 @@ eventTypeCounterMap =  {'lock': 2,
 						'trackDescription' : 1,
 						'trackData' : 1,
 						'mute' : 2,
-						'temperature' : 1,
+						'temperature' : 2,
 						'heatingSetpoint' : 1,
 						'coolingSetpoint' : 1,
-						'thermostatSetpoint' : 1}
+						'thermostatSetpoint' : 1,
+                                                'threeAxis' : 1}
 
 # Mapping for specific event types
 eventTypesMap =  	   {'alarm.both': 'alarm',
@@ -71,6 +72,7 @@ eventTypesMap =  	   {'alarm.both': 'alarm',
 						'tamper.tampered' : 'contact',
 						'doorState.open' : 'doorState',
 						'doorState.closed' : 'doorState',
+						'position' : 'location',
 						'mode' : 'location',
 						'mode.away' : 'location',
 						'mode.home' : 'location',
@@ -333,8 +335,12 @@ def ExtractEvents(extractedEvents):
 	#print "DEBUG: App1: %d" % indexApp1
 	#print "DEBUG: App2: %d" % indexApp2
 	#print "DEBUG: eventList: %d" % len(eventList)
+	#print eventAppList
 	#print eventList
-	isApp1 = True
+	if indexApp2Start > 0:
+		isApp1 = True
+	else:
+		isApp1 = False
 	while counter < numOfActualEvents:
 		# Interleave events from App1 and App2
 		if isApp1 is True:
@@ -455,6 +461,7 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "motion":
+                        print("HERE????")
 			#Write two events subsequently
 			event = open("eventSimulator/motionActiveEvent.groovy", "r")			
 			for line in event:
@@ -655,6 +662,8 @@ def ExtractEvents(extractedEvents):
 				eventVarCounterMap[eventList[i]] = eventVarCount + 1
 			capability = capabilityMap[variable[eventVarCount]]
 			#Write two events subsequently
+                        print("//////////////////////")
+                        print(capability)
 			if capability == "capability.switch":
 				event = open("eventSimulator/switchOnEvent.groovy", "r")
 			elif capability == "capability.switchLevel":
@@ -737,36 +746,42 @@ def ExtractEvents(extractedEvents):
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "acceleration.active":
-			event = open("eventSimulator/accelerationDefaultActiveEvent.groovy", "r")
+		elif eventList[i] == "sleeping":
+			#Write two events subsequently
+			event = open("eventSimulator/sleepSleepingEvent.groovy", "r")			
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "acceleration.inactive":
-			event = open("eventSimulator/accelerationDefaultInactiveEvent.groovy", "r")
+			extractedEvents.write("\n\t\t\tbreak\n")
+			counter = counter + 1
+			extractedEvents.write("\t\tcase %d:\n" % counter)
+			event = open("eventSimulator/sleepNotSleepingEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "sleeping":
+		elif eventList[i] == "goal":
 			#Write two events subsequently
-			event = open("eventSimulator/sleepSleepingEvent.groovy", "r")			
+			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/sleepNotSleepingEvent.groovy", "r")
+			event = open("eventSimulator/stepGoalLowEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "goal":
-			event = open("eventSimulator/stepGoalEvent.groovy", "r")
+		elif eventList[i] == "steps":
+			#Write two events subsequently
+			event = open("eventSimulator/stepStepsHighEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
-		elif eventList[i] == "steps":
-			event = open("eventSimulator/stepStepsEvent.groovy", "r")
+			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 +811,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()
@@ -806,7 +829,14 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "humidity":
-			event = open("eventSimulator/humidityMeasurementEvent.groovy", "r")
+			event = open("eventSimulator/humidityHighMeasurementEvent.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/humidityLowMeasurementEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
@@ -901,6 +931,8 @@ def ExtractEvents(extractedEvents):
 				event = open("eventSimulator/switchLevelEvent.groovy", "r")
 			elif capability == "capability.colorControl":
 				event = open("eventSimulator/colorLevelChangeEvent.groovy", "r")
+                        elif capability == "capability.switch":
+                                event = open("eventSimulator/switchLevelChangeEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
@@ -937,10 +969,21 @@ def ExtractEvents(extractedEvents):
 				eventVarCount = eventVarCounterMap[eventList[i]]
 				eventVarCounterMap[eventList[i]] = eventVarCount + 1
 			capability = capabilityMap[variable[eventVarCount]]
+			#Write two events subsequently
+			if capability == "capability.thermostat":
+				event = open("eventSimulator/temperatureHighEvent.groovy", "r")
+			elif capability == "capability.temperatureMeasurement":
+				event = open("eventSimulator/temperatureHighMeasurementEvent.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)
 			if capability == "capability.thermostat":
-				event = open("eventSimulator/temperatureEvent.groovy", "r")
+				event = open("eventSimulator/temperatureLowEvent.groovy", "r")
 			elif capability == "capability.temperatureMeasurement":
-				event = open("eventSimulator/temperatureMeasurementEvent.groovy", "r")
+				event = open("eventSimulator/temperatureLowMeasurementEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
@@ -959,6 +1002,11 @@ def ExtractEvents(extractedEvents):
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
+                elif eventList[i] == "threeAxis":
+                        event = open("eventSimulator/threeAxisChangeEvent.groovy", "r")
+                        for line in event:
+                                extractedEvents.write(line)
+                        event.close()
 			
 		###TODO: Add more events later
 		extractedEvents.write("\n\t\t\tbreak\n")