X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Runner.py;h=81efa7a0c02eaf42b82d09542635651ba4940dfe;hb=6a3a273e5f6e06ccc341797135741e70ead78fd3;hp=8e2db793888869dbbfceb0df17383282fb43caf2;hpb=3925f487d36485129a31d40edbfcf092b6cbf02b;p=smartthings-infrastructure.git

diff --git a/Runner.py b/Runner.py
index 8e2db79..81efa7a 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")
@@ -116,6 +117,10 @@ Out.write("import ColorTemperature.ColorTemperature\n")
 Out.write("import ColorTemperature.ColorTemperatures\n")
 Out.write("import Button.Button\n")
 Out.write("import Button.Buttons\n")
+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 Event.Event\n")
 Out.write("import Timer.SimulatedTimer\n")
 Out.write("\n")
@@ -127,13 +132,18 @@ for line in eventHandler:
 	Out.write(line)
 Out.write("\n")
 Out.write("//GlobalVariables for both Apps\n")
+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")
@@ -162,6 +172,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:
@@ -213,6 +225,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")
@@ -240,6 +253,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")
@@ -268,6 +283,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:
@@ -313,22 +330,22 @@ Out.write("}\n")
 Out.write("\n")
 Out.write("@Field def app1\n")
 Out.write("@Field def app2\n")
-Out.write("def initOrder = Verify.getBoolean()\n")
-Out.write("if (initOrder) {\n")
+Out.write("//def initOrder = Verify.getBoolean()\n")
+Out.write("//if (initOrder) {\n")
 Out.write("\tapp1 = new App1(this)\n")
 Out.write("\tapp2 = new App2(this)\n")
-Out.write("} else {\n")
-Out.write("\tapp2 = new App2(this)\n")
-Out.write("\tapp1 = new App1(this)\n")
-Out.write("}\n\n")
-Out.write("def installOrder = Verify.getBoolean()\n")
-Out.write("if (installOrder) {\n")
+Out.write("//} else {\n")
+Out.write("\t//app2 = new App2(this)\n")
+Out.write("\t//app1 = new App1(this)\n")
+Out.write("//}\n\n")
+Out.write("//def installOrder = Verify.getBoolean()\n")
+Out.write("//if (installOrder) {\n")
 Out.write("\tapp1.installed()\n")
 Out.write("\tapp2.installed()\n")
-Out.write("} else {\n")
-Out.write("\tapp2.installed()\n")
-Out.write("\tapp1.installed()\n")
-Out.write("}\n\n")
+Out.write("//} else {\n")
+Out.write("\t//app2.installed()\n")
+Out.write("\t//app1.installed()\n")
+Out.write("//}\n\n")
 for line in eventSimulator:
 	Out.write(line)
 Out.close()