From d58ceb0d7a69116e8142643adfc840b667d8c06d Mon Sep 17 00:00:00 2001
From: rtrimana <rtrimana@uci.edu>
Date: Tue, 6 Aug 2019 18:43:40 -0700
Subject: [PATCH 1/1] Adding event for Power as variation is needed in power
 values.

---
 Extractor/ExtractorScript.py                   | 10 +++++++++-
 SpeechSynthesis/SpeechSynthesis.groovy         |  4 ++--
 SpeechSynthesis/SpeechSynthesises.groovy       |  4 ++--
 eventSimulator/powerMeterHighPowerEvent.groovy |  2 ++
 eventSimulator/powerMeterLowPowerEvent.groovy  |  2 ++
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 eventSimulator/powerMeterHighPowerEvent.groovy
 create mode 100644 eventSimulator/powerMeterLowPowerEvent.groovy

diff --git a/Extractor/ExtractorScript.py b/Extractor/ExtractorScript.py
index 1172b4e..cf4b9de 100644
--- a/Extractor/ExtractorScript.py
+++ b/Extractor/ExtractorScript.py
@@ -795,7 +795,15 @@ def ExtractEvents(extractedEvents):
 				extractedEvents.write(line)
 			event.close()
 		elif eventList[i] == "power":
-			event = open("eventSimulator/powerMeterEvent.groovy", "r")
+			#Write two events subsequently
+			event = open("eventSimulator/powerMeterHighPowerEvent.groovy", "r")
+			for line in event:
+				extractedEvents.write(line)
+			event.close()
+			extractedEvents.write("\n\t\t\tbreak\n")
+			counter = counter + 1
+			extractedEvents.write("\t\tcase %d:\n" % counter)
+			event = open("eventSimulator/powerMeterLowPowerEvent.groovy", "r")
 			for line in event:
 				extractedEvents.write(line)
 			event.close()
diff --git a/SpeechSynthesis/SpeechSynthesis.groovy b/SpeechSynthesis/SpeechSynthesis.groovy
index fb91378..1f25d79 100644
--- a/SpeechSynthesis/SpeechSynthesis.groovy
+++ b/SpeechSynthesis/SpeechSynthesis.groovy
@@ -29,9 +29,9 @@ public class SpeechSynthesis {
 		println("Speech synthesis with id:$id, SPEAKING:\"$message\"!")
 		// As a conflict variable
 		if (oneUser) {
-			oneUser = false
+			this.oneUser = false
 		} else {
-			oneUser = true
+			this.oneUser = true
 		}
 	}
 }
diff --git a/SpeechSynthesis/SpeechSynthesises.groovy b/SpeechSynthesis/SpeechSynthesises.groovy
index 69601c4..876e48d 100644
--- a/SpeechSynthesis/SpeechSynthesises.groovy
+++ b/SpeechSynthesis/SpeechSynthesises.groovy
@@ -61,9 +61,9 @@ public class SpeechSynthesises {
 		speechSynthesises[0].speak(message)
 		// As a conflict variable
 		if (oneUser) {
-			oneUser = false
+			this.oneUser = false
 		} else {
-			oneUser = true
+			this.oneUser = true
 		}
 	}
 
diff --git a/eventSimulator/powerMeterHighPowerEvent.groovy b/eventSimulator/powerMeterHighPowerEvent.groovy
new file mode 100644
index 0000000..2fdf6dd
--- /dev/null
+++ b/eventSimulator/powerMeterHighPowerEvent.groovy
@@ -0,0 +1,2 @@
+			powerMeterObject.setValue([name: "power", value: "70"/*A number between 0 to 100 as a charge*/, deviceId: "powerMeterID0", descriptionText: "",
+					displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
diff --git a/eventSimulator/powerMeterLowPowerEvent.groovy b/eventSimulator/powerMeterLowPowerEvent.groovy
new file mode 100644
index 0000000..58f7c58
--- /dev/null
+++ b/eventSimulator/powerMeterLowPowerEvent.groovy
@@ -0,0 +1,2 @@
+			powerMeterObject.setValue([name: "power", value: "30"/*A number between 0 to 100 as a charge*/, deviceId: "powerMeterID0", descriptionText: "",
+					displayed: true, linkText: "", isStateChange: false, unit: "", data: '{"info": "info"}'])
-- 
2.34.1