behaviours generate just fine now, missions is next. We also need some color functions

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

diff --git a/dsl/runtime/src/nl/ru/des/Sensors.java b/dsl/runtime/src/nl/ru/des/SensorCollector.java
similarity index 89%
rename from dsl/runtime/src/nl/ru/des/Sensors.java
rename to dsl/runtime/src/nl/ru/des/SensorCollector.java
index 1b014d8..7695ee0 100644 (file)
--- a/dsl/runtime/src/nl/ru/des/Sensors.java
+++ b/dsl/runtime/src/nl/ru/des/SensorCollector.java
@@ -2,14 +2,14 @@ package nl.ru.des;
 
 import lejos.robotics.SampleProvider;
 
-public class Sensors{
+public class SensorCollector{
        public static final int DELAY = 50;
        
        private SampleProvider ultrasone, color, leftTouch, rightTouch;
        private float[] ultrasoneSamples, colorSamples, leftTouchSamples, rightTouchSamples;
        private long ultrasoneTime, colorTime, leftTouchTime, rightTouchTime;
 
-       public Sensors(SampleProvider ultrasone,
+       public SensorCollector(SampleProvider ultrasone,
                        SampleProvider color,
                        SampleProvider leftTouch,
                        SampleProvider rightTouch){
@@ -27,7 +27,7 @@ public class Sensors{
                rightTouchTime = System.currentTimeMillis();
        }
        
-       public float getDistance(){
+       public float distance(){
                if(System.currentTimeMillis()-ultrasoneTime>DELAY){
                        ultrasone.fetchSample(ultrasoneSamples, 0);
                        ultrasoneTime = System.currentTimeMillis();
@@ -35,7 +35,7 @@ public class Sensors{
                return ultrasoneSamples[0];
        }
        
-       public int getColor(){
+       public int color(){
                if(System.currentTimeMillis()-colorTime>DELAY){
                        color.fetchSample(colorSamples, 0);
                        colorTime = System.currentTimeMillis();
@@ -43,7 +43,7 @@ public class Sensors{
                return (int)colorSamples[0];
        }
        
-       public boolean getLeftTouch(){
+       public boolean leftTouch(){
                if(System.currentTimeMillis()-leftTouchTime>DELAY){
                        leftTouch.fetchSample(leftTouchSamples, 0);
                        leftTouchTime = System.currentTimeMillis();
@@ -51,7 +51,7 @@ public class Sensors{
                return leftTouchSamples[0]==1;
        }
        
-       public boolean getRightTouch(){
+       public boolean rightTouch(){
                if(System.currentTimeMillis()-rightTouchTime>DELAY){
                        rightTouch.fetchSample(rightTouchSamples, 0);
                        rightTouchTime = System.currentTimeMillis();