From fd77cc1f0f7177d6736431b28f680a83f04e50ca Mon Sep 17 00:00:00 2001
From: rschoene <rene.schoene@tu-dresden.de>
Date: Wed, 15 Jun 2022 16:28:44 +0200
Subject: [PATCH] update
- remove operations Pick, Place
---
ros3rag.placeB/src/main/jastadd/WorldModelB.jadd | 8 --------
ros3rag.placeB/src/main/jastadd/WorldModelB.relast | 6 ------
2 files changed, 14 deletions(-)
diff --git a/ros3rag.placeB/src/main/jastadd/WorldModelB.jadd b/ros3rag.placeB/src/main/jastadd/WorldModelB.jadd
index 2c5a092..334c172 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 1de1dcc..a0d205c 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 ;
--
GitLab