Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/smartthings-infrastructure

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 0fa30bad5a28e734e4d8539ca527ff67907de962..5f18f9f80a8bb61db3f1ff60b1d6c4f5803f3590 100644 (file)
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -338,7 +338,13 @@ def ExtractEvents(extractedEvents):
        # Count the number of events
        numOfActualEvents = CountEvents()
        extractedEvents.write("while(true) {\n")
-       extractedEvents.write("\tdef eventNumber = Verify.getInt(0,%d)\n" % (numOfActualEvents - 1))
+       # We use Verify.getIntFromList() instead of Verify.getInt() since we want to manipulate the
+       # choices in the list/set to implement POR
+       #extractedEvents.write("\tdef eventNumber = Verify.getInt(0,%d)\n" % (numOfActualEvents - 1))
+       extractedEvents.write("\tdef eventNumber = Verify.getIntFromList(0,")
+       for x in range (1, numOfActualEvents - 1):
+               extractedEvents.write("%d," % x)
+       extractedEvents.write("%d)\n" % (numOfActualEvents - 1))
        extractedEvents.write("\tswitch(eventNumber) {\n")
        counter = 0
        indexApp1 = 0
@@ -1099,6 +1105,7 @@ def ExtractEvents(extractedEvents):
                extractedEvents.write("\n\t\t\tbreak\n")
                counter = counter + 1
        extractedEvents.write("\t}\n")
+       extractedEvents.write("\tprintln(\"\\nEVENT NUMBER: \" + eventNumber)\n");
        extractedEvents.write("}\n")
        
 def CheckIfOnlyTouchEvents():