Cleaning up scripts.

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 0e9539f84609079004eec1d85376b35ebc8227a8..97b6bff9e9d51414459e73b54eb546612c4589db 100644 (file)
--- 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":
                        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]
                        #Check which capability
                        variable = eventVarMap[eventList[i]]
                        capability = capabilityMap[variable]

diff --git a/ModelCheck.py b/ModelCheck.py
index b47a095aa3c53ca3e7c5027962063146984fbdb0..c192cfa48ecafe72be736fc997adcd6bb9a33ef1 100644 (file)
--- 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")
        # 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"
        
        # 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")
        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()
        
 writeLogList.close()