X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Extractor%2FExtractorScript.py;h=660295dc5aea9944eb261ad96b832232a3b91812;hb=6cf2e56e176c75f6e11cc8911420b2c86780dc0a;hp=c8786e671728918703cb790dcf09e1c9aa5ed155;hpb=ee9cba47d90646862ed8aa4abcac45811612a810;p=smartthings-infrastructure.git

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index c8786e6..660295d 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -47,8 +47,8 @@ eventTypeCounterMap =  {'lock': 2,
 						'saturation' : 1,
 						'energy' : 1,
 						'power' : 2,
-						'illuminance' : 1,
-						'humidity' : 1,
+						'illuminance' : 2,
+						'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',
@@ -259,6 +261,7 @@ def AnalyzeCapabilities(Temp, appName, F):
 			Temp == "capability.switchLevel" or
 			Temp == "capability.illuminanceMeasurement" or
 			Temp == "capability.colorControl" or
+			Temp == "capability.colorTemperature" or
 			#Motion related
 			Temp == "capability.motionSensor" or
 			Temp == "capability.accelerationSensor" or
@@ -287,7 +290,7 @@ def AnalyzeCapabilities(Temp, appName, F):
 def AnalyzePhysicalInteraction(app1Capab, app2Capab):
 	#Light
 	if ("capability.illuminanceMeasurement" in app1Capab) and ("capability.switch" in app2Capab or 
-			"capability.switchLevel" in app2Capab or "capability.colorControl" in app2Capab):
+			"capability.switchLevel" in app2Capab or "capability.colorControl" or "capability.colorTemperature" in app2Capab):
 		print ("\nWARNING: Potential PHYSICAL CONFLICT (light) detected between App1 and App2!\n")
 	#Motion
 	# TODO: Technically this is not entirely precise since we need to be able to detect that the other app creates motion
@@ -333,8 +336,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:
@@ -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":
@@ -815,12 +824,26 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "illuminance":
-			event = open("eventSimulator/illuminanceMeasurementEvent.groovy", "r")
+			event = open("eventSimulator/illuminanceMeasurementLowEvent.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/illuminanceMeasurementHighEvent.groovy", "r")
 			for line in event:
 				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()
@@ -915,6 +938,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()
@@ -951,10 +976,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()
@@ -973,6 +1009,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")