Skip to content
Snippets Groups Projects
Commit 3daebb2f authored by René Schöne's avatar René Schöne
Browse files

Add support for arbitrary moves in place-a used for evaluation.

parent e32e8948
No related branches found
No related tags found
1 merge request!1Multiple scenes, multiple robots and more
Pipeline #10387 passed
...@@ -23,6 +23,7 @@ public class MainA extends SharedMainParts<MqttHandler, WorldModelA> { ...@@ -23,6 +23,7 @@ public class MainA extends SharedMainParts<MqttHandler, WorldModelA> {
private final String TOPIC_DEMO_MOVE_objectRed1_BLUE; private final String TOPIC_DEMO_MOVE_objectRed1_BLUE;
private final String TOPIC_DEMO_MOVE_objectRed1_RED; private final String TOPIC_DEMO_MOVE_objectRed1_RED;
private final String TOPIC_EVAL_MOVE;
MainA(String configFile) { MainA(String configFile) {
super("place-a", UtilA.pathToDirectoryOfPlaceA().resolve(configFile)); super("place-a", UtilA.pathToDirectoryOfPlaceA().resolve(configFile));
...@@ -31,6 +32,7 @@ public class MainA extends SharedMainParts<MqttHandler, WorldModelA> { ...@@ -31,6 +32,7 @@ public class MainA extends SharedMainParts<MqttHandler, WorldModelA> {
this.TOPIC_DEMO_MOVE_objectRed1_BLUE = cellName + "/demo/move/objectRed1/blue"; this.TOPIC_DEMO_MOVE_objectRed1_BLUE = cellName + "/demo/move/objectRed1/blue";
this.TOPIC_DEMO_MOVE_objectRed1_RED = cellName + "/demo/move/objectRed1/red"; this.TOPIC_DEMO_MOVE_objectRed1_RED = cellName + "/demo/move/objectRed1/red";
this.TOPIC_EVAL_MOVE = cellName + "/eval/move";
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
...@@ -46,6 +48,12 @@ public class MainA extends SharedMainParts<MqttHandler, WorldModelA> { ...@@ -46,6 +48,12 @@ public class MainA extends SharedMainParts<MqttHandler, WorldModelA> {
mainHandler.newConnection(TOPIC_DEMO_MOVE_objectRed1_RED, bytes -> mainHandler.newConnection(TOPIC_DEMO_MOVE_objectRed1_RED, bytes ->
UtilA.updatePositionOfObjectToLocation(model.getScene(), "objectRed1", "binRed") UtilA.updatePositionOfObjectToLocation(model.getScene(), "objectRed1", "binRed")
); );
mainHandler.newConnection(TOPIC_EVAL_MOVE, bytes -> {
String[] tokens = new String(bytes).split(" to ");
String objectName = tokens[0];
String locationName = tokens[1];
UtilA.updatePositionOfObjectToLocation(model.getScene(), objectName, locationName);
});
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment