From: amiraj <amiraj.95@uci.edu>
Date: Thu, 1 Aug 2019 21:23:38 +0000 (-0700)
Subject: some changes in methods
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=d09f937c88170b4f5691eb2602aed3612e0d750c

some changes in methods
---

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index c37c2b8..803b635 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -555,17 +555,17 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "color":
-			event = open("eventSimulator/colorChangedEvent.groovy", "r")
+			event = open("eventSimulator/colorChangeEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "hue":
-			event = open("eventSimulator/hueChangedEvent.groovy", "r")
+			event = open("eventSimulator/hueChangeEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "saturation":
-			event = open("eventSimulator/saturationChangedEvent.groovy", "r")
+			event = open("eventSimulator/saturationChangeEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
diff --git a/Methods/schedule.groovy b/Methods/schedule.groovy
index fef90b4..6089a06 100644
--- a/Methods/schedule.groovy
+++ b/Methods/schedule.groovy
@@ -1,50 +1,50 @@
 /////////////////////////////////////////////////////////////////////
 ////schedule(time, nameOfFunction as String)
 def schedule(String time, String nameOfFunction) {
-	def _inputTime = time.split(':')
-	Date date = new Date()	
-	def _currentTime = date.format("HH:mm:ss").split(':')
+	//def _inputTime = time.split(':')
+	//Date date = new Date()	
+	//def _currentTime = date.format("HH:mm:ss").split(':')
 
 	//Convert input time and current time to minutes
-	def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
-	def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
-	def delay
+	//def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
+	//def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
+	//def delay
 
-	if (inputTime < currentTime) {
-		delay = 24*60*60-inputTime+currentTime
-	} else {
-		delay = inputTime-currentTime
-	}
+	//if (inputTime < currentTime) {
+	//	delay = 24*60*60-inputTime+currentTime
+	//} else {
+	//	delay = inputTime-currentTime
+	//}
 
-	timersFuncList.add(nameOfFunction)
-	timersList.add(new SimulatedTimer())
-	def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(delay*1000*0) {
+	//timersFuncList.add(nameOfFunction)
+	//timersList.add(new SimulatedTimer())
+	def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*1000*0*/0) {
 		"$nameOfFunction"()
 	}
 }
 ////schedule(time, nameOfFunction as Closure)
 def schedule(String time, Closure nameOfFunction) {
-	def _inputTime = time.split(':')
-	Date date = new Date()	
+	//def _inputTime = time.split(':')
+	//Date date = new Date()	
 	def _currentTime = date.format("HH:mm:ss").split(':')
 
 	//Convert input time and current time to minutes
-	def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
-	def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
-	def delay
+	//def inputTime = Integer.parseInt(_inputTime[0])*3600+Integer.parseInt(_inputTime[1])*60
+	//def currentTime = Integer.parseInt(_currentTime[0])*3600+Integer.parseInt(_currentTime[1])*60+Integer.parseInt(_currentTime[2])
+	//def delay
 
-	if (inputTime < currentTime) {
-		delay = 24*60*60-inputTime+currentTime
-	} else {
-		delay = inputTime-currentTime
-	}
+	//if (inputTime < currentTime) {
+	//	delay = 24*60*60-inputTime+currentTime
+	//} else {
+	//	delay = inputTime-currentTime
+	//}
 
 	if (timersFuncList.contains(nameOfFunction)) {
 		timersList[timersFuncList.indexOf(nameOfFunction)].cancel()
-		def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(delay*0, nameOfFunction)
+		def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*0*/0, nameOfFunction0)
 	} else {
 		timersFuncList.add(nameOfFunction)
 		timersList.add(new SimulatedTimer())
-		def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(delay*0, nameOfFunction)
+		def task = timersList[timersFuncList.indexOf(nameOfFunction)].runAfter(/*delay*0*/0, nameOfFunction)
 	}
 }