Improvements and new methods

diff --git a/Extractor/Extractor.groovy b/Extractor/Extractor.groovy
index 58721250259feda3219a7bb5d20cea79868c0193..2e82fb3fef08229a42658a87191b89b684975b99 100644 (file)
--- 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 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") {
 @Field chooseMode = 0
 //Empty the files
 if (App == "App1") {


@@ -115,7 +115,7 @@ if (App == "App1") {
        extractedObjectsApp2.write("")
        extractedObjectsConstructorApp2.write("")
        if (assignDifferentModes)
        extractedObjectsApp2.write("")
        extractedObjectsConstructorApp2.write("")
        if (assignDifferentModes)

-               chooseMode = 1
+               chooseMode = 2

 }
 
 
 }
 
 

diff --git a/Methods/schedule.groovy b/Methods/schedule.groovy
index 1d8c810b7e70c195e8c1372a5ce4c338c00781b0..f4fcf24cc318f2eeebd4d666a5612bb836666948 100644 (file)
--- a/Methods/schedule.groovy
+++ b/Methods/schedule.groovy
@@ -22,6 +22,11 @@ def schedule(String time, String nameOfFunction) {
        }*/
        "$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(':')
 ////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 83727722d5fbbe4e9b565ba181b95c81d1de4f4c..67db55410bec374162b2406d86d98484ab5f63ed 100644 (file)
--- a/MusicPlayer/MusicPlayer.groovy
+++ b/MusicPlayer/MusicPlayer.groovy
@@ -2,6 +2,8 @@
 package MusicPlayer
 import Timer.SimulatedTimer
 
 package MusicPlayer
 import Timer.SimulatedTimer
 

+//JPF's Verify API
+import gov.nasa.jpf.vm.Verify

 
 public class MusicPlayer {
        private String id
 
 public class MusicPlayer {
        private String id

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index a9693db8d3965047a64a0b9175ef0f89c7da35c9..92f6c550a9db80f957165d58bc7b713a946d99de 100644 (file)
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -172,6 +172,15 @@ public class MusicPlayers {
                        this.level = level
                }
        }
                        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) {
        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) {
                }
        }
        def statesSince(String info, Date dateObj, LinkedHashMap map) {

-               return presenceSensors[0].statesSince()
+               return musicPlayers[0].statesSince()

        }
        def playText(LinkedHashMap metaData) {
                playText()
        }
        def playText(LinkedHashMap metaData) {
                playText()