Adding more features for physical interaction detection and warning.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 375a68823a5ae31166a3616478037556b9a03a04..974afc453933e8c6f2dd0921524127d3465f4cfe 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -86,7 +86,7 @@ def ExtractFunctions(F, appName):
                                eventVarMap[Temp] = variable
 
                #Check and analyze capabilities for physical interaction
-               AnalyzeCapabilities(Temp, appName)
+               AnalyzeCapabilities(Temp, appName, F)
 
                Temp = GetToken(F)
        
@@ -96,7 +96,7 @@ def ExtractFunctions(F, appName):
 
                
 
-def AnalyzeCapabilities(Temp, appName):
+def AnalyzeCapabilities(Temp, appName, F):
                        #Illuminance related
        if (Temp == "capability.switch" or
                        Temp == "capability.switchLevel" or
@@ -115,6 +115,15 @@ def AnalyzeCapabilities(Temp, appName):
                        app1Capabilities.append(Temp)
                else:
                        app2Capabilities.append(Temp)
+       if (Temp == "capability"):
+               Temp = GetToken(F) #Get '"'
+               Temp = GetToken(F) #Get 'Music'
+               Temp = Temp + GetToken(F) #Get 'Player'
+               if (Temp == "MusicPlayer"):
+                       if (appName == "App1"):
+                               app1Capabilities.append("capability.musicPlayer")
+                       else:
+                               app2Capabilities.append("capability.musicPlayer")
                        
 def AnalyzePhysicalInteraction(app1Capab, app2Capab):
        #Light

diff --git a/ModelCheck.py b/ModelCheck.py
index 6defff69a3b55c00ae600ff8816f5c4bdb3b936e..601323e0f9012dd5251d395a412c42a05a8238d6 100644 (file)
--- a/ModelCheck.py
+++ b/ModelCheck.py
@@ -61,14 +61,16 @@ print "PHASE 2: Running JPF ...\n"
 writeLogList = open(jpfLogDir + "logList", "w+")
 for item in appPairs:
 
-       # Copy apps into Extractor/App1 and Extractor/App2      
+       # Copy apps into Extractor/App1 and Extractor/App2
+       print "==> First app: %s" % item[0]
+       print "==> Second app: %s" % item[1]
        os.system("cp " + appDir + item[0] + " Extractor/App1/App1.groovy")
        os.system("cp " + appDir + item[1] + " Extractor/App2/App2.groovy")
        
        # Run Runner.py to extract things and create main.groovy, then compile it
        print "==> Compiling the apps ...\n"
        os.system("make Runner")
-       os.system("make main")
+       #os.system("make main")
        
        # Call JPF
        print "==> Calling JPF and generate logs ...\n"