X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Runner.py;h=ed4e62c38741d48a67263ebabe2a7029e3558862;hb=d57a6f7fd0a35286e270d8b39ac7fbf45af88b08;hp=e5700dfa327527e6a9e53e7c3f1f8b2c47a4f951;hpb=9b3a7c405329818e6971d6de851ad730971fe4c0;p=smartthings-infrastructure.git

diff --git a/Runner.py b/Runner.py
index e5700df..ed4e62c 100644
--- a/Runner.py
+++ b/Runner.py
@@ -15,6 +15,7 @@ GlobalVariablesEachApp = open("GlobalVariables/"+"GlobalVariablesEachApp.groovy"
 setLocationMode = open("Methods/"+"setLocationMode.groovy", "r")
 subscribe = open("Methods/"+"subscribe.groovy", "r")
 runIn = open("Methods/"+"runIn.groovy", "r")
+runDaily = open("Methods/"+"runDaily.groovy", "r")
 unschedule = open("Methods/"+"unschedule.groovy", "r")
 sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy", "r")
 sendSms = open("Methods/"+"sendSms.groovy", "r")
@@ -120,6 +121,7 @@ Out.write("import ThreeAxis.ThreeAxis\n")
 Out.write("import ThreeAxis.ThreeAxises\n")
 Out.write("import Momentary.Momentary\n")
 Out.write("import Momentary.Momentaries\n")
+Out.write("import RemainingDevices.RemainingDevices\n")
 Out.write("import Event.Event\n")
 Out.write("import Timer.SimulatedTimer\n")
 Out.write("\n")
@@ -135,10 +137,14 @@ Out.write("@Field def init = Verify.getBoolean()\n\n")
 for line in GlobalVariablesBothApps:
 	Out.write(line)
 Out.write("\n")
+Out.write("//clear init flag now we are done with it\n")
+Out.write("init = false\n")
 Out.write("//Application #1\n")
 Out.write("class App1 {\n")
 Out.write("\tdef reference\n")
 Out.write("\tdef location\n")
+Out.write("\t// A local variable added for conflict detection tool\n")
+Out.write("\tdef location_mode\n")
 Out.write("\tdef app\n")
 Out.write("\n")
 Out.write("\t//Extracted objects for App1\n")
@@ -167,6 +173,8 @@ for line in subscribe:
 	Out.write("\t"+line)
 for line in runIn:
 	Out.write("\t"+line)
+for line in runDaily:
+	Out.write("\t"+line)
 for line in unschedule:
 	Out.write("\t"+line)
 for line in sendNotificationToContacts:
@@ -218,6 +226,7 @@ GlobalVariablesEachApp = open("GlobalVariables/"+"GlobalVariablesEachApp.groovy"
 setLocationMode = open("Methods/"+"setLocationMode.groovy", "r")
 subscribe = open("Methods/"+"subscribe.groovy", "r")
 runIn = open("Methods/"+"runIn.groovy", "r")
+runDaily = open("Methods/"+"runDaily.groovy", "r")
 unschedule = open("Methods/"+"unschedule.groovy", "r")
 sendNotificationToContacts = open("Methods/"+"sendNotificationToContacts.groovy", "r")
 sendSms = open("Methods/"+"sendSms.groovy", "r")
@@ -245,6 +254,8 @@ Out.write("//Application #2\n")
 Out.write("class App2 {\n")
 Out.write("\tdef reference\n")
 Out.write("\tdef location\n")
+Out.write("\t// A local variable added for conflict detection tool\n")
+Out.write("\tdef location_mode\n")
 Out.write("\tdef app\n")
 Out.write("\n")
 Out.write("\t//Extracted objects for App2\n")
@@ -273,6 +284,8 @@ for line in subscribe:
 	Out.write("\t"+line)
 for line in runIn:
 	Out.write("\t"+line)
+for line in runDaily:
+	Out.write("\t"+line)
 for line in unschedule:
 	Out.write("\t"+line)
 for line in sendNotificationToContacts: