diff --git a/ros3rag.placeB/src/main/jastadd/WorldModelB.jadd b/ros3rag.placeB/src/main/jastadd/WorldModelB.jadd index 2c5a0926a526b6643e0419da1cbed652980dda12..334c1722eb73f860a50df175a7204805bb2c3fb4 100644 --- a/ros3rag.placeB/src/main/jastadd/WorldModelB.jadd +++ b/ros3rag.placeB/src/main/jastadd/WorldModelB.jadd @@ -403,12 +403,6 @@ aspect AttributeMappings { } return null; } - eq Pick.toProtobufByteArray() { - throw new RuntimeException("Separate Pick operation not supported yet!"); - } - eq Place.toProtobufByteArray() { - throw new RuntimeException("Separate Place operation not supported yet!"); - } eq PickAndPlace.toProtobufByteArray() = de.tudresden.inf.st.ceti.Command.newBuilder() .setPickAndPlace(de.tudresden.inf.st.ceti.PickAndPlace.newBuilder() .setIdRobot(getRobotToExecute().getName()) @@ -567,8 +561,6 @@ aspect Printing { eq PickAndPlace.prettyPrint() { return "+PickAndPlace by " + getRobotToExecute().prettyPrint() + " of " + getObjectToPick().prettyPrint() + " -> " + getTargetLocation().prettyPrint() + "+"; } - eq Pick.prettyPrint() = "+Pick not implemented+"; - eq Place.prettyPrint() = "+Place not implemented+"; eq ErrorOperation.prettyPrint() { return "+Error: " + getErrorMessage() + "+"; } diff --git a/ros3rag.placeB/src/main/jastadd/WorldModelB.relast b/ros3rag.placeB/src/main/jastadd/WorldModelB.relast index 1de1dcc4edb9e8128ef10cfeaf365094858a171e..a0d205c8d41a369b72d4c2f28f9ae8838309fb78 100644 --- a/ros3rag.placeB/src/main/jastadd/WorldModelB.relast +++ b/ros3rag.placeB/src/main/jastadd/WorldModelB.relast @@ -22,12 +22,6 @@ abstract Operation ; rel Operation.RobotToExecute? -> Robot ; ErrorOperation : Operation ::= <ErrorMessage:String> ; -Pick : Operation ; -rel Pick.ObjectToPick -> LogicalMovableObject ; - -Place : Operation ; -rel Place.TargetLocation -> DropOffLocation ; - PickAndPlace : Operation ; rel PickAndPlace.ObjectToPick -> LogicalMovableObject ; rel PickAndPlace.TargetLocation -> DropOffLocation ;