From: rtrimana <rtrimana@uci.edu>
Date: Sat, 10 Aug 2019 14:06:27 +0000 (-0700)
Subject: Improvements and new methods
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=commitdiff_plain;h=43db66bdb5ba7a2f07e9cbb04e0c44fddd6510be;hp=8556a42043486d0c2852a9344a7c0df8c79d73fd

Improvements and new methods
---

diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy
index 5872125..2e82fb3 100644
--- a/Extractor/Extractor.groovy
+++ b/Extractor/Extractor.groovy
@@ -102,7 +102,7 @@ import Timer.SimulatedTimer
 @Field File extractedObjectsConstructorApp2 = new File("Extractor/App2/extractedObjectsConstructorApp2.groovy")
 
 //Set this to true for global-state variable conflict
-@Field assignDifferentModes = false
+@Field assignDifferentModes = true
 @Field chooseMode = 0
 //Empty the files
 if (App == "App1") {
@@ -115,7 +115,7 @@ if (App == "App1") {
 	extractedObjectsApp2.write("")
 	extractedObjectsConstructorApp2.write("")
 	if (assignDifferentModes)
-		chooseMode = 1
+		chooseMode = 2
 }
 
 
diff --git a/Methods/schedule.groovy b/Methods/schedule.groovy
index 1d8c810..f4fcf24 100644
--- a/Methods/schedule.groovy
+++ b/Methods/schedule.groovy
@@ -22,6 +22,11 @@ def schedule(String time, String nameOfFunction) {
 	}*/
 	"$nameOfFunction"()
 }
+/////////////////////////////////////////////////////////////////////
+////schedule(Date, nameOfFunction as String)
+def schedule(Date date, String nameOfFunction) {
+	"$nameOfFunction"()
+}
 ////schedule(time, nameOfFunction as Closure)
 def schedule(String time, Closure nameOfFunction) {
 	/*def _inputTime = time.split(':')
diff --git a/MusicPlayer/MusicPlayer.groovy b/MusicPlayer/MusicPlayer.groovy
index 8372772..67db554 100644
--- a/MusicPlayer/MusicPlayer.groovy
+++ b/MusicPlayer/MusicPlayer.groovy
@@ -2,6 +2,8 @@
 package MusicPlayer
 import Timer.SimulatedTimer
 
+//JPF's Verify API
+import gov.nasa.jpf.vm.Verify
 
 public class MusicPlayer {
 	private String id
diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index a9693db..92f6c55 100644
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -172,6 +172,15 @@ public class MusicPlayers {
 			this.level = level
 		}
 	}
+	def playSoundAndTrack(String trackData, int duration, int trackNumber, int level) {
+		playTrackAndResume(trackData, duration)
+		if (level != this.level) {
+			this.level = level
+		}
+		if (trackNumber!= this.trackNumber) {
+			this.trackNumber = trackNumber
+		}
+	}
 	def playTrackAtVolume(String trackData, int level) {
 		playTrack(trackData)
 		if (level != this.level) {
@@ -238,7 +247,7 @@ public class MusicPlayers {
 		}
 	}
 	def statesSince(String info, Date dateObj, LinkedHashMap map) {
-		return presenceSensors[0].statesSince()
+		return musicPlayers[0].statesSince()
 	}
 	def playText(LinkedHashMap metaData) {
 		playText()