rename RobotScene to RobotWorld, move physical robot from test to main

src/main/jastadd/cleanup/RobotWorld.connect

 // --- receiving ---
-receive RobotScene.Table using ParseScene, ConvertScene ;
+receive RobotWorld.Table using ParseScene, ConvertScene ;
 
 ParseScene maps byte[] bytes to de.tudresden.inf.st.ceti.Scene {:
   return de.tudresden.inf.st.ceti.Scene.parseFrom(bytes);

src/main/jastadd/cleanup/RobotWorld.jadd

 aspect RobotWorld {
 
-  public boolean RobotScene.simulated = true;
-  public String RobotScene.commandTopic = "/ceti_cell_empty/command";
-  public org.fusesource.mqtt.client.BlockingConnection RobotScene.connection;
+  public boolean RobotWorld.simulated = true;
+  public String RobotWorld.commandTopic = "/ceti_cell_empty/command";
+  public org.fusesource.mqtt.client.BlockingConnection RobotWorld.connection;
 
-  public static RobotScene RobotScene.initialWorld(java.util.Random random) {
+  public static RobotWorld RobotWorld.initialWorld(java.util.Random random) {
     Table t = new Table();
     t.addPhysicalObject(new Bin("binRed", Pose.of(-10, -10, 0), "red"));
     t.addPhysicalObject(new Bin("binGreen", Pose.of(-10, 0, 0), "green"));
@@ -13,15 +13,15 @@ aspect RobotWorld {
     Robot r = new Robot();
     r.setIsIdle(true);
     t.setRobot(r);
-    return new RobotScene(t);
+    return new RobotWorld(t);
   }
 
-  public static RobotScene RobotScene.initialWorld() {
+  public static RobotWorld RobotWorld.initialWorld() {
     Robot r = new Robot();
     r.setIsIdle(true);
     Table t = new Table();
     t.setRobot(r);
-    RobotScene result = new RobotScene(t);
+    RobotWorld result = new RobotWorld(t);
     result.simulated = false;
     return result;
   }
@@ -49,14 +49,14 @@ aspect RobotWorld {
   }
 
   @Override
-  public String RobotScene.toString() {
+  public String RobotWorld.toString() {
     return print();
   }
 
   public EmptyTable World.parseEmptyTable() {
     return null;
   }
-  public EmptyTable RobotScene.parseEmptyTable() {
+  public EmptyTable RobotWorld.parseEmptyTable() {
     System.out.print("Trying to parse token <EmptyTable>... ");
     if (getTable().isEmpty()) {
       System.out.println("success");
@@ -70,7 +70,7 @@ aspect RobotWorld {
   public NotEmptyTable World.parseNotEmptyTable() {
     return null;
   }
-  public NotEmptyTable RobotScene.parseNotEmptyTable() {
+  public NotEmptyTable RobotWorld.parseNotEmptyTable() {
     System.out.print("Trying to parse token <NotEmptyTable>... ");
     if (!getTable().isEmpty()) {
       System.out.println("success");
@@ -84,7 +84,7 @@ aspect RobotWorld {
   public ObjectAtWrongPlace World.parseObjectAtWrongPlace(Tidy context) {
     return null;
   }
-  public ObjectAtWrongPlace RobotScene.parseObjectAtWrongPlace(Tidy context) {
+  public ObjectAtWrongPlace RobotWorld.parseObjectAtWrongPlace(Tidy context) {
     System.out.print("Trying to parse token <ObjectAtWrongPlace>... ");
     // TODO get a *random* object?
     for (PhysicalObject o : getTable().getPhysicalObjectList()) {
@@ -100,7 +100,7 @@ aspect RobotWorld {
   public RobotIsReadyToPickToken World.parseRobotIsReadyToPickToken() {
     return null;
   }
-  public RobotIsReadyToPickToken RobotScene.parseRobotIsReadyToPickToken() {
+  public RobotIsReadyToPickToken RobotWorld.parseRobotIsReadyToPickToken() {
     System.out.println("Trying to parse token <RobotIsReadyToPickToken> by parsing ALL sub-tokens...");
     RobotIsIdle idle = parseRobotIsIdle();
     RobotHasNoItemAttached noItem = parseRobotHasNoItemAttached();
@@ -116,7 +116,7 @@ aspect RobotWorld {
   public RobotIsNotReadyToPickToken World.parseRobotIsNotReadyToPickToken() {
     return null;
   }
-  public RobotIsNotReadyToPickToken RobotScene.parseRobotIsNotReadyToPickToken() {
+  public RobotIsNotReadyToPickToken RobotWorld.parseRobotIsNotReadyToPickToken() {
     System.out.println("Trying to parse token <RobotIsNotReadyToPickToken> by parsing ANY sub-tokens...");
     RobotIsNotIdle notIdle = parseRobotIsNotIdle();
     RobotHasItemAttached item = parseRobotHasItemAttached();
@@ -132,7 +132,7 @@ aspect RobotWorld {
   public RobotIsReadyToDropToken World.parseRobotIsReadyToDropToken() {
     return null;
   }
-  public RobotIsReadyToDropToken RobotScene.parseRobotIsReadyToDropToken() {
+  public RobotIsReadyToDropToken RobotWorld.parseRobotIsReadyToDropToken() {
     System.out.println("Trying to parse token <RobotIsReadyToDropToken> by parsing ALL sub-tokens...");
     RobotIsIdle idle = parseRobotIsIdle();
     RobotHasItemAttached item = parseRobotHasItemAttached();
@@ -148,7 +148,7 @@ aspect RobotWorld {
   public RobotIsNotReadyToDropToken World.parseRobotIsNotReadyToDropToken() {
     return null;
   }
-  public RobotIsNotReadyToDropToken RobotScene.parseRobotIsNotReadyToDropToken() {
+  public RobotIsNotReadyToDropToken RobotWorld.parseRobotIsNotReadyToDropToken() {
     System.out.println("Trying to parse token <RobotIsNotReadyToDropToken> by parsing ANY sub-tokens...");
     RobotIsNotIdle notIdle = parseRobotIsNotIdle();
     RobotHasNoItemAttached noItem = parseRobotHasNoItemAttached();
@@ -164,7 +164,7 @@ aspect RobotWorld {
   public RobotIsIdle World.parseRobotIsIdle() {
     return null;
   }
-  public RobotIsIdle RobotScene.parseRobotIsIdle() {
+  public RobotIsIdle RobotWorld.parseRobotIsIdle() {
     System.out.print("Trying to parse token <RobotIsIdle>... ");
     if (getTable().getRobot().getIsIdle()) {
       System.out.println("success");
@@ -178,7 +178,7 @@ aspect RobotWorld {
   public RobotIsNotIdle World.parseRobotIsNotIdle() {
     return null;
   }
-  public RobotIsNotIdle RobotScene.parseRobotIsNotIdle() {
+  public RobotIsNotIdle RobotWorld.parseRobotIsNotIdle() {
     System.out.print("Trying to parse token <RobotIsNotIdle>... ");
     if (!getTable().getRobot().getIsIdle()) {
       System.out.println("success");
@@ -192,7 +192,7 @@ aspect RobotWorld {
   public RobotHasItemAttached World.parseRobotHasItemAttached() {
     return null;
   }
-  public RobotHasItemAttached RobotScene.parseRobotHasItemAttached() {
+  public RobotHasItemAttached RobotWorld.parseRobotHasItemAttached() {
     System.out.print("Trying to parse token <RobotHasItemAttached>... ");
     if (getTable().getRobot().hasAttachedItem()) {
       System.out.println("success");
@@ -206,7 +206,7 @@ aspect RobotWorld {
   public RobotHasNoItemAttached World.parseRobotHasNoItemAttached() {
     return null;
   }
-  public RobotHasNoItemAttached RobotScene.parseRobotHasNoItemAttached() {
+  public RobotHasNoItemAttached RobotWorld.parseRobotHasNoItemAttached() {
     System.out.print("Trying to parse token <RobotHasNoItemAttached>... ");
     if (!getTable().getRobot().hasAttachedItem()) {
       System.out.println("success");
@@ -220,7 +220,7 @@ aspect RobotWorld {
   public Wait World.parseWait(double time) {
     return null;
   }
-  public Wait RobotScene.parseWait(double time) {
+  public Wait RobotWorld.parseWait(double time) {
     System.out.print("Trying to parse token <Wait> for " + time + " seconds... ");
     System.out.println("success");
     return new Wait();
@@ -229,7 +229,7 @@ aspect RobotWorld {
   public RightPlace World.parseRightPlace(String objectName) {
     return null;
   }
-  public RightPlace RobotScene.parseRightPlace(String objectName) {
+  public RightPlace RobotWorld.parseRightPlace(String objectName) {
     System.out.print("Trying to parse token <RightPlace> for Object \"" + objectName + "\"... ");
     MovableObject o = getTable().getMovableObjectByName(objectName);
 

src/main/jastadd/cleanup/RobotWorld.relast

 // World Model of the Motion Grammar
 
-RobotScene : World ::= Table;
+RobotWorld : World ::= Table;
 
 Table ::= PhysicalObject* Robot;
 abstract PhysicalObject ::= <Name> Pose <Color>;