update code

[des2015.git] / dsl / runtime / src / nl / ru / des / Marster.java

diff --git a/dsl/runtime/src/nl/ru/des/Marster.java b/dsl/runtime/src/nl/ru/des/Marster.java
index ee38341..81ee5f6 100644 (file)
--- a/dsl/runtime/src/nl/ru/des/Marster.java
+++ b/dsl/runtime/src/nl/ru/des/Marster.java
@@ -1,6 +1,7 @@
 package nl.ru.des;
 
 import java.util.LinkedList;
+import java.util.Random;
 
 import lejos.hardware.ev3.EV3;
 import lejos.hardware.ev3.LocalEV3;
@@ -17,12 +18,12 @@ import lejos.hardware.sensor.NXTLightSensor;
 import lejos.robotics.RegulatedMotor;
 import lejos.robotics.SampleProvider;
 import nl.ru.des.sensors.BTController;
-import nl.ru.des.Arbitrator;
 import nl.ru.des.sensors.RemoteSensors;
 import nl.ru.des.sensors.SensorCollector;
 
 public class Marster {
        public static Arbitrator arb;
+       public static Random random;
        
        @SuppressWarnings("resource")
        public static void main(String[] args) {
@@ -80,9 +81,11 @@ public class Marster {
                        BTController.startMaster(slave, sc);
                        LCDPrinter.print("Finished loading");
                        LinkedList<Mission> missions = Missions.getMissions(sc, rightMotor, leftMotor, measMotor);
+                       random = new Random();
                        for(Mission m : missions){
                                LCDPrinter.print("Start " + m.name + " mission...");
                                arb = new Arbitrator(m.behaviours);
+                               sc.resetColors();
                                arb.start();
                                LCDPrinter.print(m.name + " finished!!1one!");
                        }