repositories
/
des2015.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented finding park space
[des2015.git]
/
dsl
/
runtime
/
src
/
nl
/
ru
/
des
/
sensors
/
SensorCollector.java
diff --git
a/dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
b/dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
index
4597d92
..
db10870
100644
(file)
--- a/
dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
+++ b/
dsl/runtime/src/nl/ru/des/sensors/SensorCollector.java
@@
-1,6
+1,5
@@
package nl.ru.des.sensors;
package nl.ru.des.sensors;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
import java.util.HashSet;
import java.util.Set;
@@
-14,7
+13,7
@@
public class SensorCollector implements MessageHandler{
private static final float DANGER_DISTANCE_BACK = 0.035f;
private static final float DANGER_LIGHT = 0.40f;
private static final float DANGER_DISTANCE_BACK = 0.035f;
private static final float DANGER_LIGHT = 0.40f;
- private Set<
Integer> collectedColor
s;
+ private Set<
String> variable
s;
//Local sensors
private EV3GyroSensor gyroSensor;
//Local sensors
private EV3GyroSensor gyroSensor;
@@
-49,7
+48,7
@@
public class SensorCollector implements MessageHandler{
leftTouch = false;
rightTouch = false;
frontUltra = Float.MAX_VALUE;
leftTouch = false;
rightTouch = false;
frontUltra = Float.MAX_VALUE;
-
collectedColors = new HashSet<Integer
>();
+
variables = new HashSet<String
>();
}
//Local sensors
}
//Local sensors
@@
-90,12
+89,16
@@
public class SensorCollector implements MessageHandler{
}
//Remote sensors
}
//Remote sensors
- public void reset
Colors
(){
-
collectedColor
s.clear();
+ public void reset(){
+
variable
s.clear();
}
}
- public boolean collected(int[] colors){
- return collectedColors.containsAll(Arrays.asList(colors));
+ public boolean collected(String var){
+ return variables.contains(var);
+ }
+
+ public void saveVar(String var) {
+ variables.add(var);
}
public int color(){
}
public int color(){
@@
-120,7
+123,6
@@
public class SensorCollector implements MessageHandler{
switch(RemoteSensors.RemoteSensorEnum.values()[Integer.valueOf(Character.toString(m.charAt(0)))]){
case COLOR:
color = Integer.valueOf(s);
switch(RemoteSensors.RemoteSensorEnum.values()[Integer.valueOf(Character.toString(m.charAt(0)))]){
case COLOR:
color = Integer.valueOf(s);
- collectedColors.add(color);
break;
case LEFT:
leftTouch = Integer.valueOf(s)==1;
break;
case LEFT:
leftTouch = Integer.valueOf(s)==1;