A bit of cleaning up.
[smartthings-infrastructure.git] / Extractor / ExtractorScript.py
index 974afc453933e8c6f2dd0921524127d3465f4cfe..c8786e671728918703cb790dcf09e1c9aa5ed155 100644 (file)
@@ -2,13 +2,124 @@ import os
 readyToReturn = 0
 ToReturn = ""
 eventList = []
+eventAppList = [] # This list maps App1 or App2 to a specific event
 eventVarMap = {}
+eventVarCounterMap = {}
 capabilityMap = {}
+capabilityList = []
 app1Capabilities = []
 app2Capabilities = []
 app1Subscribe = False
 app2Subscribe = False
 
+# Mapping for event type and number of events
+# e.g., switch has 2 events: on and off
+eventTypeCounterMap =  {'lock': 2,
+                                               'nfcTouch' : 1,
+                                               'app' : 1,
+                                               'button' : 2,
+                                               'water' : 2,
+                                               'water.dry' : 1,
+                                               'water.wet' : 1,
+                                               'presence' : 2,
+                                               'doorState' : 2,
+                                               'motion' : 2,
+                                               'smoke' : 3,
+                                               'carbonMonoxide' : 3,
+                                               'battery' : 1,
+                                               'thermostatMode' : 5,
+                                               'thermostatFanMode' : 5,
+                                               'thermostatOperatingState' : 5,
+                                               'switch' : 2,
+                                               'location' : 3,
+                                               'mode' : 3,
+                                               'sunset' : 1,
+                                               'sunsetTime' : 1,
+                                               'sunrise' : 1,
+                                               'sunriseTime' : 1,
+                                               'acceleration' : 2,
+                                               'sleeping' : 2,
+                                               'goal' : 2,
+                                               'steps' : 2,
+                                               'color' : 1,
+                                               'colorTemperature' : 1,
+                                               'hue' : 1,
+                                               'saturation' : 1,
+                                               'energy' : 1,
+                                               'power' : 2,
+                                               'illuminance' : 1,
+                                               'humidity' : 1,
+                                               'alarm' : 4,
+                                               'contact' : 2,
+                                               'status' : 3,
+                                               'level' : 1,
+                                               'trackDescription' : 1,
+                                               'trackData' : 1,
+                                               'mute' : 2,
+                                               'temperature' : 1,
+                                               'heatingSetpoint' : 1,
+                                               'coolingSetpoint' : 1,
+                                               'thermostatSetpoint' : 1}
+
+# Mapping for specific event types
+eventTypesMap =           {'alarm.both': 'alarm',
+                                               'alarm.siren' : 'alarm',
+                                               'alarm.strobe' : 'alarm',
+                                               'alarm.off' : 'alarm',
+                                               'contact.open' : 'contact',
+                                               'contact.closed' : 'contact',
+                                               'tamper.tampered' : 'contact',
+                                               'doorState.open' : 'doorState',
+                                               'doorState.closed' : 'doorState',
+                                               'mode' : 'location',
+                                               'mode.away' : 'location',
+                                               'mode.home' : 'location',
+                                               'mode.night' : 'location',
+                                               'lock.locked' : 'lock',
+                                               'lock.unlocked' : 'lock',
+                                               'motion.active' : 'motion',
+                                               'motion.inactive' : 'motion',
+                                               'status.playing' : 'status',
+                                               'status.stopped' : 'status',
+                                               'status.paused' : 'status',
+                                               'mute.muted' : 'mute',
+                                               'mute.unmuted' : 'mute',
+                                               'presence.present' : 'presence',
+                                               'presence.not present' : 'presence',
+                                               'presence.not' : 'presence',
+                                               'smoke.detected' : 'smoke',
+                                               'smoke.clear' : 'smoke',
+                                               'smoke.tested' : 'smoke',
+                                               'carbonMonoxide.detected' : 'carbonMonoxide',
+                                               'carbonMonoxide.clear' : 'carbonMonoxide',
+                                               'carbonMonoxide.tested' : 'carbonMonoxide',
+                                               'thermostatMode.cool' : 'thermostatMode',
+                                               'thermostatMode.auto' : 'thermostatMode',
+                                               'thermostatMode.emergencyHeat' : 'thermostatMode',
+                                               'thermostatMode.heat' : 'thermostatMode',
+                                               'thermostatMode.off' : 'thermostatMode',
+                                               'thermostatFanMode.auto' : 'thermostatFanMode',
+                                               'thermostatFanMode.fanCirculate' : 'thermostatFanMode',
+                                               'thermostatFanMode.circulate' : 'thermostatFanMode',
+                                               'thermostatFanMode.fanOn' : 'thermostatFanMode',
+                                               'thermostatFanMode.on' : 'thermostatFanMode',
+                                               'fanMode' : 'thermostatFanMode',
+                                               'fanMode.auto' : 'thermostatFanMode',
+                                               'fanMode.fanCirculate' : 'thermostatFanMode',
+                                               'fanMode.circulate' : 'thermostatFanMode',
+                                               'fanMode.fanOn' : 'thermostatFanMode',
+                                               'fanMode.on' : 'thermostatFanMode',
+                                               'switch.on' : 'switch',
+                                               'switch.off' : 'switch',
+                                               'button.pushed' : 'button',
+                                               'button.held' : 'button',
+                                               'acceleration.active' : 'acceleration',
+                                               'acceleration.inactive' : 'acceleration',
+                                               'sleeping.sleeping' : 'sleeping',
+                                               'sleeping.not sleeping' : 'sleeping',
+                                               'water.dry' : 'water',
+                                               'water.wet' : 'water'}
+
 def GetToken(f):
        global readyToReturn
        global ToReturn
@@ -41,14 +152,18 @@ def GetToken(f):
 
 def ExtractFunctions(F, appName):
        global eventList
+       global eventAppList
+       global eventTypesMap
        global app1Subscribe
        global app2Subscribe
        Temp = GetToken(F)
        while (Temp != "EOF"):
                if (Temp == "def" or Temp == "private"):
                        Temp = GetToken(F)
+                       if (Temp == "def" or Temp == "private"):
+                               Temp = GetToken(F)
                        NameofFunc = Temp
-                       if (GetToken(F) != "="): #We have a function to create object for
+                       if (GetToken(F) == "("): #We have a function to create object for
                                if (appName == "App1"):
                                        extractedFunctionsApp1.write("//Global Object for functions in subscribe method!\n")    
                                        extractedFunctionsApp1.write("def %s = this.&" % NameofFunc)
@@ -60,13 +175,14 @@ def ExtractFunctions(F, appName):
                
                #Check input capability
                if (Temp == "input"):
-                       Temp = GetToken(F) #Get '"'
+                       while Temp != "\"":
+                               Temp = GetToken(F)
                        variable = GetToken(F)
                        Temp = GetToken(F) #Get '"'
                        Temp = GetToken(F) #Get ','
-                       Temp = GetToken(F) #Get '"'
-                       Temp = GetToken(F) #Get capability...
-                       capability = Temp
+                       while Temp != "\"":
+                               Temp = GetToken(F)
+                       capability = GetToken(F)
                        capabilityMap[variable] = capability
                
                #Check subscribed events
@@ -76,14 +192,57 @@ def ExtractFunctions(F, appName):
                        else:
                                app2Subscribe = True
                        Temp = GetToken(F)
+                       if (Temp == "("):
+                               Temp = GetToken(F)
                        variable = Temp
                        while (Temp != "\"" and Temp != "app" and Temp != "location"):
                                Temp = GetToken(F)
+                       if Temp == "location":
+                               # See if we have another case for location
+                               Temp = GetToken(F) # Get ','
+                               Temp = GetToken(F) # Get '"'
+                               if Temp == "\"":
+                                       Temp = GetToken(F)                      
+                               else:
+                                       # This is the special case where we will see, e.g., sunset, sunrise, etc.
+                                       Temp = "location"
                        if Temp == "\"":
                                Temp = GetToken(F)
-                       if Temp not in eventList:
+
+                       #print "DEBUG: %s - %s" % (variable, Temp)
+                       #print capabilityMap
+                       #print "DEBUG: location variable: %s" % Temp    
+
+                        #This is a bogus event, just skip it...
+                        if Temp == "unlock":
+                                continue                        
+                       #Translate and reduce through mapping
+                       if Temp in eventTypesMap.keys():                
+                               Temp = eventTypesMap[Temp]
+                       if Temp == "app" or Temp == "location" or Temp == "mode" or Temp == "sunset" or Temp == "sunrise" or Temp == "sunsetTime" or Temp == "sunriseTime":
+                               if Temp not in eventList:
+                                       eventList.append(Temp)
+                                       if (appName == "App1"):
+                                               eventAppList.append("App1")
+                                       else:
+                                               eventAppList.append("App2")
+                       elif Temp not in eventList or (variable in capabilityMap.keys() and capabilityMap[variable] not in capabilityList):
+                               # We do not repeat the same capability twice
+                               capability = capabilityMap[variable]
+                               capabilityList.append(capability)
                                eventList.append(Temp)
-                               eventVarMap[Temp] = variable
+                               if (appName == "App1"):
+                                       eventAppList.append("App1")
+                               else:
+                                       eventAppList.append("App2")
+                               if Temp in eventVarMap.keys():
+                                       listOfEvents = eventVarMap[Temp]
+                                       listOfEvents.append(variable)
+                               else:
+                                       eventVarMap[Temp] = [variable]
+                       #print "DEBUG: %s - %s" % (variable, Temp)
+                       #print capabilityMap
+                       #print eventList
 
                #Check and analyze capabilities for physical interaction
                AnalyzeCapabilities(Temp, appName, F)
@@ -94,15 +253,15 @@ def ExtractFunctions(F, appName):
        AnalyzePhysicalInteraction(app1Capabilities, app2Capabilities)
        AnalyzePhysicalInteraction(app2Capabilities, app1Capabilities)
 
-               
-
 def AnalyzeCapabilities(Temp, appName, F):
                        #Illuminance related
        if (Temp == "capability.switch" or
                        Temp == "capability.switchLevel" or
                        Temp == "capability.illuminanceMeasurement" or
+                       Temp == "capability.colorControl" or
                        #Motion related
                        Temp == "capability.motionSensor" or
+                       Temp == "capability.accelerationSensor" or
                        #Water related
                        Temp == "capability.valve" or
                        Temp == "capability.waterSensor" or
@@ -128,10 +287,11 @@ 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):
+                       "capability.switchLevel" in app2Capab or "capability.colorControl" in app2Capab):
                print ("\nWARNING: Potential PHYSICAL CONFLICT (light) detected between App1 and App2!\n")
        #Motion
-       if ("capability.motionSensor" in app1Capab):
+       # TODO: Technically this is not entirely precise since we need to be able to detect that the other app creates motion
+       if ("capability.motionSensor" in app1Capab) or ("capability.accelerationSensor" in app1Capab):
                print ("\nWARNING: Potential PHYSICAL CONFLICT (motion) detected between App1 and App2!\n")             
        #Water
        if ("capability.waterSensor" in app1Capab) and ("capability.valve" in app2Capab or 
@@ -142,252 +302,490 @@ def AnalyzePhysicalInteraction(app1Capab, app2Capab):
                        "capability.alarm" in app2Capab or "capability.speechSynthesis" in app2Capab):
                print ("\nWARNING: Potential PHYSICAL CONFLICT (sound) detected between App1 and App2!\n")
 
+def CountEvents():
+       global eventList
+       numOfActualEvents = 0
+       #print "DEBUG: eventlist: %d" % len(eventList)
+       #print "DEBUG: eventlist: %s" % eventList
+       for event in eventList:
+               #print "DEBUG: Event: %s %d" % (event, eventTypeCounterMap[event])
+               numOfActualEvents = numOfActualEvents + eventTypeCounterMap[event]
+       return numOfActualEvents
+
 def ExtractEvents(extractedEvents):
        global eventList
+       global eventAppList
        global eventVarMap
        global capabilityMap
+       global eventVarCounterMap
+       # Count the number of events
+       numOfActualEvents = CountEvents()
        extractedEvents.write("while(true) {\n")
-       extractedEvents.write("\tdef eventNumber = Verify.getInt(0,%d)\n" % (len(eventList) - 1))
+       extractedEvents.write("\tdef eventNumber = Verify.getInt(0,%d)\n" % (numOfActualEvents - 1))
        extractedEvents.write("\tswitch(eventNumber) {\n")
-       for i in range(len(eventList)):
-               extractedEvents.write("\t\tcase %d:\n" % i)
+       counter = 0
+       indexApp1 = 0
+       if "App2" in eventAppList:
+               indexApp2 = eventAppList.index("App2")
+       else:
+               indexApp2 = len(eventList)
+       indexApp2Start = indexApp2
+       #print "DEBUG: App1: %d" % indexApp1
+       #print "DEBUG: App2: %d" % indexApp2
+       #print "DEBUG: eventList: %d" % len(eventList)
+       #print eventList
+       isApp1 = True
+       while counter < numOfActualEvents:
+               # Interleave events from App1 and App2
+               if isApp1 is True:
+                       i = indexApp1
+                       indexApp1 = indexApp1 + 1
+                       if indexApp2 < len(eventList):
+                               isApp1 = False
+               else:
+                       i = indexApp2
+                       indexApp2 = indexApp2 + 1
+                       if indexApp1 < indexApp2Start:
+                               isApp1 = True
+               #print "DEBUG: i: %d" % i
+               extractedEvents.write("\t\tcase %d:\n" % counter)
                if eventList[i] == "lock":
-                       event = open("eventSimulator/lockEvent.groovy", "r")
+                       #Write two events subsequently
+                       event = open("eventSimulator/lockLockedEvent.groovy", "r")                      
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "unlock":
-                       event = open("eventSimulator/unlockEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/lockUnlockedEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "contact.open":
-                       event = open("eventSimulator/contactOpenEvent.groovy", "r")
+               elif eventList[i] == "nfcTouch":
+                       event = open("eventSimulator/nfcTouchEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "contact.closed":
-                       event = open("eventSimulator/contactClosedEvent.groovy", "r")
+               elif eventList[i] == "app": #Case for Touched event
+                       event = open("eventSimulator/appTouchEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "nfcTouch":
-                       event = open("eventSimulator/nfcTouchEvent.groovy", "r")
+               elif eventList[i] == "button":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
+                       #Write two events subsequently
+                       if capability == "capability.button":
+                               event = open("eventSimulator/buttonHeldEvent.groovy", "r")
+                       elif capability == "device.aeonKeyFob":
+                               event = open("eventSimulator/aeonKeyFobHeldEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "app": #Case for Touched event
-                       event = open("eventSimulator/appTouchEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       if capability == "capability.button":
+                               event = open("eventSimulator/buttonPushedEvent.groovy", "r")
+                       elif capability == "device.aeonKeyFob":
+                               event = open("eventSimulator/aeonKeyFobPushedEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-               elif eventList[i] == "button":
+               elif eventList[i] == "water":
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
-                       event = open("eventSimulator/buttonPushedEvent.groovy", "r")                    
+                       event = open("eventSimulator/waterDryEvent.groovy", "r")                        
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
-                       event = open("eventSimulator/buttonHeldEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       event = open("eventSimulator/waterWetEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "presence":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
-                       event = open("eventSimulator/presencePresentEvent.groovy", "r")                 
+                       if capability == "capability.presenceSensor":
+                               event = open("eventSimulator/presencePresentEvent.groovy", "r")
+                       elif capability == "capability.beacon":
+                               event = open("eventSimulator/beaconPresentEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
-                       event = open("eventSimulator/presenceLeftEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       if capability == "capability.presenceSensor":
+                               event = open("eventSimulator/presenceLeftEvent.groovy", "r")
+                       elif capability == "capability.beacon":
+                               event = open("eventSimulator/beaconLeftEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "doorState":
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
                        event = open("eventSimulator/doorOpenEvent.groovy", "r")                        
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/doorClosedEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "motion":
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
                        event = open("eventSimulator/motionActiveEvent.groovy", "r")                    
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/motionInactiveEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "smoke":
                        #Write three events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,2)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
                        event = open("eventSimulator/smokeClearEvent.groovy", "r")                      
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else if (event == 1) {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/smokeDetectedEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/smokeTestedEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "carbonMonoxide":
                        #Check which capability
                        variable = eventVarMap[eventList[i]]
-                       capability = capabilityMap[variable]
-       
-                       #Write three events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,2)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")                      
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
+                       #Write three events subsequently        
                        if capability == "capability.smokeDetector":
                                event = open("eventSimulator/smokeCarbonMonoxideClearEvent.groovy", "r")
                        elif capability == "capability.carbonMonoxideDetector":
                                event = open("eventSimulator/carbonMonoxideClearEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else if (event == 1) {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        if capability == "capability.smokeDetector":
                                event = open("eventSimulator/smokeCarbonMonoxideDetectedEvent.groovy", "r")
                        elif capability == "capability.carbonMonoxideDetector":
                                event = open("eventSimulator/carbonMonoxideDetectedEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        if capability == "capability.smokeDetector":
                                event = open("eventSimulator/smokeCarbonMonoxideTestedEvent.groovy", "r")
                        elif capability == "capability.carbonMonoxideDetector":
                                event = open("eventSimulator/carbonMonoxideTestedEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "battery":
-                       event = open("eventSimulator/batteryChargeEvent.groovy", "r")
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
+                       if capability == "capability.smokeDetector":
+                               event = open("eventSimulator/smokeDetectorBatteryEvent.groovy", "r")
+                       elif capability == "capability.battery":
+                               event = open("eventSimulator/batteryBatteryEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
                elif eventList[i] == "thermostatMode":
                        #Write five events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,4)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
                        event = open("eventSimulator/thermostatAutoModeEvent.groovy", "r")                      
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else if (event == 1) {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/thermostatCoolModeEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else if (event == 2) {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/thermostatEmergencyHeatModeEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else if (event == 3) {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/thermostatHeatModeEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/thermostatOffModeEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "thermostatFanMode":
+                       #Write five events subsequently
+                       event = open("eventSimulator/thermostatAutoFanModeEvent.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/thermostatFanCirculateFanModeEvent.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/thermostatCirculateFanModeEvent.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/thermostatFanOnFanModeEvent.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/thermostatOnFanModeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "thermostatOperatingState":
+                       #Write five events subsequently
+                       event = open("eventSimulator/thermostatOperatingStateAutoEvent.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/thermostatOperatingStateCoolEvent.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/thermostatOperatingStateOffEvent.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/thermostatOperatingStateEmergencyHeatEvent.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/thermostatOperatingStateHeatEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "switch":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
-                       event = open("eventSimulator/switchOnEvent.groovy", "r")                        
+                       if capability == "capability.switch":
+                               event = open("eventSimulator/switchOnEvent.groovy", "r")
+                       elif capability == "capability.switchLevel":
+                               event = open("eventSimulator/switchLevelOnEvent.groovy", "r")
+                       elif capability == "capability.relaySwitch":
+                               event = open("eventSimulator/relaySwitchOnEvent.groovy", "r")
+                       elif capability == "capability.colorControl":
+                               event = open("eventSimulator/colorControlSwitchOnEvent.groovy", "r")
+                       elif capability == "capability.colorTemperature":
+                               event = open("eventSimulator/colorTemperatureSwitchOnEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
-                       event = open("eventSimulator/switchOffEvent.groovy", "r")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
+                       if capability == "capability.switch":
+                               event = open("eventSimulator/switchOffEvent.groovy", "r")
+                       elif capability == "capability.switchLevel":
+                               event = open("eventSimulator/switchLevelOffEvent.groovy", "r")
+                       elif capability == "capability.relaySwitch":
+                               event = open("eventSimulator/relaySwitchOffEvent.groovy", "r")
+                       elif capability == "capability.colorControl":
+                               event = open("eventSimulator/colorControlSwitchOffEvent.groovy", "r")
+                       elif capability == "capability.colorTemperature":
+                               event = open("eventSimulator/colorTemperatureSwitchOffEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "location": #Case for Location event
                        #Write three events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,2)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
                        event = open("eventSimulator/locationHomeEvent.groovy", "r")                    
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else if (event == 1) {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/locationAwayEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/locationNightEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "sunrise":
+                       event = open("eventSimulator/locationSunriseEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "sunset":
+                       event = open("eventSimulator/locationSunsetEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "sunsetTime":
+                       event = open("eventSimulator/locationSunsetTimeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "sunriseTime":
+                       event = open("eventSimulator/locationSunriseTimeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "acceleration":
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
                        event = open("eventSimulator/accelerationActiveEvent.groovy", "r")                      
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
+                       extractedEvents.write("\n\t\t\tbreak\n")
+                       counter = counter + 1
+                       extractedEvents.write("\t\tcase %d:\n" % counter)
                        event = open("eventSimulator/accelerationInactiveEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "sleeping":
+                       #Write two events subsequently
+                       event = open("eventSimulator/sleepSleepingEvent.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")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "goal":
+                       #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()
-                       extractedEvents.write("\t\t\t}\n")
-               elif eventList[i] == "beacon":
+               elif eventList[i] == "steps":
                        #Write two events subsequently
-                       extractedEvents.write("\t\t\tdef event = Verify.getInt(0,1)\n")
-                       extractedEvents.write("\t\t\tif (event == 0) {\n")
-                       event = open("eventSimulator/beaconPresenceEvent.groovy", "r")                  
+                       event = open("eventSimulator/stepStepsHighEvent.groovy", "r")
                        for line in event:
-                               extractedEvents.write("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t} else {\n")
-                       event = open("eventSimulator/beaconLeftEvent.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("\t\t" + line)
+                               extractedEvents.write(line)
                        event.close()
-                       extractedEvents.write("\t\t\t}\n")
                elif eventList[i] == "color":
                        event = open("eventSimulator/colorChangeEvent.groovy", "r")
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
+               elif eventList[i] == "colorTemperature":
+                       event = open("eventSimulator/colorTemperatureEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
                elif eventList[i] == "hue":
                        event = open("eventSimulator/hueChangeEvent.groovy", "r")
                        for line in event:
@@ -398,9 +796,187 @@ def ExtractEvents(extractedEvents):
                        for line in event:
                                extractedEvents.write(line)
                        event.close()
-
+               elif eventList[i] == "energy":
+                       event = open("eventSimulator/energyMeterEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "power":
+                       #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()
+               elif eventList[i] == "illuminance":
+                       event = open("eventSimulator/illuminanceMeasurementEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "humidity":
+                       event = open("eventSimulator/humidityMeasurementEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "alarm":
+                       #Write four events subsequently
+                       event = open("eventSimulator/alarmBothEvent.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/alarmSirenEvent.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/alarmStrobeEvent.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/alarmOffEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "contact":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
+                       #Write two events subsequently
+                       if capability == "capability.contactSensor":
+                               event = open("eventSimulator/contactDefaultClosedEvent.groovy", "r")
+                       elif capability == "capability.valve":
+                               event = open("eventSimulator/valveClosedEvent.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.contactSensor":
+                               event = open("eventSimulator/contactDefaultOpenEvent.groovy", "r")
+                       elif capability == "capability.valve":
+                               event = open("eventSimulator/valveOpenEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "status":
+                       #Write three events subsequently
+                       event = open("eventSimulator/musicPlayerPlayingEvent.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/musicPlayerStoppedEvent.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/musicPlayerPausedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "level":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
+                       if capability == "capability.musicPlayer":
+                               event = open("eventSimulator/musicPlayerLevelEvent.groovy", "r")
+                       elif capability == "capability.switchLevel":
+                               event = open("eventSimulator/switchLevelEvent.groovy", "r")
+                       elif capability == "capability.colorControl":
+                               event = open("eventSimulator/colorLevelChangeEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "trackDescription":
+                       event = open("eventSimulator/musicPlayerTrackDescriptionEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "trackData":
+                       event = open("eventSimulator/musicPlayerTrackDataEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "mute":
+                       #Write two events subsequently
+                       event = open("eventSimulator/musicPlayerUnmutedEvent.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/musicPlayerMutedEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "temperature":
+                       #Check which capability
+                       variable = eventVarMap[eventList[i]]
+                       if eventList[i] not in eventVarCounterMap.keys():
+                               eventVarCounterMap[eventList[i]] = 1
+                               eventVarCount = 0
+                       else:
+                               eventVarCount = eventVarCounterMap[eventList[i]]
+                               eventVarCounterMap[eventList[i]] = eventVarCount + 1
+                       capability = capabilityMap[variable[eventVarCount]]
+                       if capability == "capability.thermostat":
+                               event = open("eventSimulator/temperatureEvent.groovy", "r")
+                       elif capability == "capability.temperatureMeasurement":
+                               event = open("eventSimulator/temperatureMeasurementEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "heatingSetpoint":
+                       event = open("eventSimulator/heatingSetpointEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "coolingSetpoint":
+                       event = open("eventSimulator/coolingSetpointEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+               elif eventList[i] == "thermostatSetpoint":
+                       event = open("eventSimulator/thermostatSetpointEvent.groovy", "r")
+                       for line in event:
+                               extractedEvents.write(line)
+                       event.close()
+                       
                ###TODO: Add more events later
-               extractedEvents.write("\t\t\tbreak\n")
+               extractedEvents.write("\n\t\t\tbreak\n")
+               counter = counter + 1
        extractedEvents.write("\t}\n")
        extractedEvents.write("}\n")
        
@@ -412,8 +988,13 @@ def CheckIfOnlyTouchEvents():
                if item != "nfcTouch" and item != "app":
                        onlyTouchEvents = False
        if onlyTouchEvents is True and app1Subscribe is True and app2Subscribe is True:
+               # Write error log file
+               extractError = open("appCreationError.log", "w+")
+               extractError.write("Direct-Direct Interaction detected: we are skipping this pair...\n")
+               extractError.close()
                raise Exception("\n\nDirect-Direct Interaction detected: we are skipping this pair...\n\n")
-               
+
+
 #Extract objects to call functions from App1
 F1 = open("Extractor/App1/App1.groovy", "r")
 extractedFunctionsApp1 = open("Extractor/App1/extractedFunctionsApp1.groovy", "w+")
@@ -474,5 +1055,3 @@ F2.close()
 os.system("groovy -classpath lib/jpf.jar Extractor/extractorFile.groovy")
 
 
-
-