From: rtrimana <rtrimana@uci.edu>
Date: Mon, 29 Jul 2019 18:29:21 +0000 (-0700)
Subject: Cleaning up scripts.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e900204811d2ccb333815adff6c6ceb19c4af1cc;p=smartthings-infrastructure.git

Cleaning up scripts.
---

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 0e9539f..97b6bff 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -262,9 +262,6 @@ def ExtractEvents(extractedEvents):
 			event.close()
 			extractedEvents.write("\t\t\t}\n")
 		elif eventList[i] == "carbonMonoxide":
-			print eventVarMap
-			print capabilityMap
-
 			#Check which capability
 			variable = eventVarMap[eventList[i]]
 			capability = capabilityMap[variable]
diff --git a/ModelCheck.py b/ModelCheck.py
index b47a095..c192cfa 100644
--- a/ModelCheck.py
+++ b/ModelCheck.py
@@ -73,12 +73,12 @@ for item in appPairs:
 	# 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"
-	logName = jpfLogDir + item[0] + "--" + item[1] + ".log"
+	logName = item[0] + "--" + item[1] + ".log"
 	writeLogList.write(logName + "\n")
-	#os.system("cd " + jpfDir + ";./run.sh " + logName + " main.jpf")
+	os.system("cd " + jpfDir + ";./run.sh " + jpfLogDir + logName + " main.jpf")
 	
 writeLogList.close()