Update ForEach[Type] -> ForEach

PickNikRobotics · Dec 30, 2024 · 06eecdc · 06eecdc
1 parent 17eb85f
commit 06eecdc
Show file tree

Hide file tree

Showing 26 changed files with 32 additions and 104 deletions.
diff --git a/src/lab_sim/objectives/pick_first_object_in_vector.xml b/src/lab_sim/objectives/pick_first_object_in_vector.xml
@@ -6,11 +6,7 @@
     _subtreeOnly="true"
     _description=""
   >
-    <Decorator
-      ID="ForEachPoseStamped"
-      vector_in="{pose_vector}"
-      out="{grasp_pose}"
-    >
+    <Decorator ID="ForEach" vector_in="{pose_vector}" out="{grasp_pose}">
       <Control ID="Sequence">
         <Action
           ID="LoadObjectiveParameters"

diff --git a/src/lab_sim/objectives/place_first_object_in_vector.xml b/src/lab_sim/objectives/place_first_object_in_vector.xml
@@ -6,11 +6,7 @@
     _subtreeOnly="true"
     _description=""
   >
-    <Decorator
-      ID="ForEachPoseStamped"
-      vector_in="{pose_vector}"
-      out="{grasp_pose}"
-    >
+    <Decorator ID="ForEach" vector_in="{pose_vector}" out="{grasp_pose}">
       <Control ID="Sequence">
         <Action
           ID="LoadObjectiveParameters"

diff --git a/src/lab_sim/objectives/plan_to_pose.xml b/src/lab_sim/objectives/plan_to_pose.xml
@@ -15,7 +15,7 @@
       <Action ID="SetupMTCCurrentState" task="{mtc_task}" />
       <Action ID="Script" code="pose_ctr := 0" />
       <Decorator
-        ID="ForEachPoseStamped"
+        ID="ForEach"
         vector_in="{target_poses}"
         out="{target_pose}"
         index="{index}"

diff --git a/src/lab_sim/objectives/run_sam2_onnx.xml b/src/lab_sim/objectives/run_sam2_onnx.xml
@@ -27,7 +27,7 @@
         timeout_sec="5.000000"
       />
       <Action ID="GetMasks3DFromMasks2D" />
-      <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+      <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
         <Action ID="GetPointCloudFromMask3D" point_cloud="{point_cloud}" />
       </Decorator>
       <Action ID="SendPointCloudToUI" point_cloud="{point_cloud_fragment}" />

diff --git a/src/moveit_pro_kinova_configs/kinova_gen3_mujoco_config/objectives/test.xml b/src/moveit_pro_kinova_configs/kinova_gen3_mujoco_config/objectives/test.xml
diff --git a/...o_mobile_manipulation/picknik_ur_mobile_config/objectives/pick_first_object_in_vector.xml b/...o_mobile_manipulation/picknik_ur_mobile_config/objectives/pick_first_object_in_vector.xml
@@ -2,11 +2,7 @@
 <root BTCPP_format="4" main_tree_to_execute="Pick first object in vector">
   <!--//////////-->
   <BehaviorTree ID="Pick first object in vector">
-    <Decorator
-      ID="ForEachPoseStamped"
-      vector_in="{pose_vector}"
-      out="{grasp_pose}"
-    >
+    <Decorator ID="ForEach" vector_in="{pose_vector}" out="{grasp_pose}">
       <Control ID="Sequence">
         <Action
           ID="LoadObjectiveParameters"

diff --git a/src/moveit_pro_mobile_manipulation/picknik_ur_mobile_config/objectives/pick_object.xml b/src/moveit_pro_mobile_manipulation/picknik_ur_mobile_config/objectives/pick_object.xml
@@ -26,11 +26,7 @@
           output_poses="{output_poses}"
         />
         <!--Flip the direction of the grasp pose-->
-        <Decorator
-          ID="ForEachPoseStamped"
-          vector_in="{output_poses}"
-          out="{flipped_pose}"
-        >
+        <Decorator ID="ForEach" vector_in="{output_poses}" out="{flipped_pose}">
           <Action
             ID="TransformPose"
             output_pose="{corrected_pose}"

diff --git a/src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/pick_first_object_in_vector.xml b/src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/pick_first_object_in_vector.xml
@@ -6,11 +6,7 @@
     _subtreeOnly="true"
     _description=""
   >
-    <Decorator
-      ID="ForEachPoseStamped"
-      vector_in="{pose_vector}"
-      out="{grasp_pose}"
-    >
+    <Decorator ID="ForEach" vector_in="{pose_vector}" out="{grasp_pose}">
       <Control ID="Sequence">
         <Action
           ID="LoadObjectiveParameters"

diff --git a/src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/place_first_object_in_vector.xml b/src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/place_first_object_in_vector.xml
@@ -6,11 +6,7 @@
     _subtreeOnly="true"
     _description=""
   >
-    <Decorator
-      ID="ForEachPoseStamped"
-      vector_in="{pose_vector}"
-      out="{grasp_pose}"
-    >
+    <Decorator ID="ForEach" vector_in="{pose_vector}" out="{grasp_pose}">
       <Control ID="Sequence">
         <Action
           ID="LoadObjectiveParameters"

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/close_cabinet_door.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/close_cabinet_door.xml
@@ -36,11 +36,7 @@
           neighbor_radius="0.1"
           output_poses="{output_poses}"
         />
-        <Decorator
-          ID="ForEachPoseStamped"
-          vector_in="{output_poses}"
-          out="{pose}"
-        >
+        <Decorator ID="ForEach" vector_in="{output_poses}" out="{pose}">
           <Control ID="Sequence">
             <Action
               ID="TransformPose"

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/detect_door_graspable_object.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/detect_door_graspable_object.xml
@@ -53,7 +53,7 @@
         camera_info="{camera_info}"
         masks3d="{masks3d}"
       />
-      <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+      <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
         <Control ID="Sequence">
           <Action
             ID="GetPointCloudFromMask3D"
@@ -82,11 +82,7 @@
         />
       </Decorator>
       <Decorator ID="ForceSuccess">
-        <Decorator
-          ID="ForEachGraspableObject"
-          vector_in="{door_objects}"
-          out="{door_object}"
-        >
+        <Decorator ID="ForEach" vector_in="{door_objects}" out="{door_object}">
           <Action ID="AlwaysFailure" />
         </Decorator>
       </Decorator>

diff --git a/...pro_ur_configs/picknik_ur_site_config/objectives/detect_fixed_handle_graspable_object.xml b/...pro_ur_configs/picknik_ur_site_config/objectives/detect_fixed_handle_graspable_object.xml
@@ -53,7 +53,7 @@
         camera_info="{camera_info}"
         masks3d="{masks3d}"
       />
-      <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+      <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
         <Control ID="Sequence">
           <Action
             ID="GetPointCloudFromMask3D"
@@ -81,7 +81,7 @@
       />
       <Decorator ID="ForceSuccess">
         <Decorator
-          ID="ForEachGraspableObject"
+          ID="ForEach"
           vector_in="{handle_objects}"
           out="{handle_object}"
         >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/detect_hinge_line_segment.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/detect_hinge_line_segment.xml
@@ -48,7 +48,7 @@
         masks3d="{masks3d}"
       />
       <Decorator ID="ForceSuccess">
-        <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+        <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
           <Action ID="AlwaysFailure" />
         </Decorator>
       </Decorator>

diff --git a/...eit_pro_ur_configs/picknik_ur_site_config/objectives/detect_lever_handle_line_segment.xml b/...eit_pro_ur_configs/picknik_ur_site_config/objectives/detect_lever_handle_line_segment.xml
@@ -49,7 +49,7 @@
         camera_info="{camera_info}"
         masks3d="{masks3d}"
       />
-      <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+      <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
         <Control ID="Sequence">
           <Action
             ID="GetPointCloudFromMask3D"

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/inspect_surface.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/inspect_surface.xml
@@ -33,11 +33,7 @@
         neighbor_radius="0.1"
         output_poses="{output_poses}"
       />
-      <Decorator
-        ID="ForEachPoseStamped"
-        vector_in="{output_poses}"
-        out="{pose}"
-      >
+      <Decorator ID="ForEach" vector_in="{output_poses}" out="{pose}">
         <Control ID="Sequence">
           <Action
             ID="TransformPose"

diff --git a/...moveit_pro_ur_configs/picknik_ur_site_config/objectives/looping_pick_and_place_object.xml b/...moveit_pro_ur_configs/picknik_ur_site_config/objectives/looping_pick_and_place_object.xml
@@ -76,11 +76,11 @@
                         detected_shapes="{cuboids}"
                       />
 
-                      <!-- Get the first detected cuboid. NOTE: this is a small hack to get ForEachGraspableObject to iterate just once, which returns the first object in the vector. -->
+                      <!-- Get the first detected cuboid. NOTE: this is a small hack to get ForEach to iterate just once, which returns the first object in the vector. -->
                       <Control ID="Sequence">
                         <Decorator ID="ForceSuccess">
                           <Decorator
-                            ID="ForEachGraspableObject"
+                            ID="ForEach"
                             vector_in="{cuboids}"
                             out="{cuboid_object}"
                           >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_cabinet_door.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_cabinet_door.xml
@@ -61,11 +61,7 @@
         output_poses="{hinge_poses}"
       />
       <!--Set up Subframes for MTC-->
-      <Decorator
-        ID="ForEachPoseStamped"
-        vector_in="{grasp_poses}"
-        out="{grasp_pose}"
-      >
+      <Decorator ID="ForEach" vector_in="{grasp_poses}" out="{grasp_pose}">
         <Action
           ID="GetMoveAlongArcSubframes"
           target_grasp_pose="{grasp_pose}"
@@ -87,7 +83,7 @@
       />
       <!--Add the subframes to the Object-->
       <Decorator
-        ID="ForEachObjectSubframe"
+        ID="ForEach"
         vector_in="{move_along_arc_subframes}"
         out="{subframe}"
       >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_door_fixed_handle_ml.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_door_fixed_handle_ml.xml
@@ -92,7 +92,7 @@
       />
       <!-- Add the subframes to the Object-->
       <Decorator
-        ID="ForEachObjectSubframe"
+        ID="ForEach"
         vector_in="{move_along_arc_subframes}"
         out="{subframe}"
       >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_door_lever_handle_ml.xml
@@ -55,7 +55,7 @@
         grasp_and_twist_subframes="{grasp_and_twist_subframes}"
       />
       <Decorator
-        ID="ForEachObjectSubframe"
+        ID="ForEach"
         vector_in="{grasp_and_twist_subframes}"
         out="{subframe}"
       >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_lever_handle_door.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/open_lever_handle_door.xml
@@ -76,7 +76,7 @@
       />
       <!--Add the subframes to the Object-->
       <Decorator
-        ID="ForEachObjectSubframe"
+        ID="ForEach"
         vector_in="{grasp_and_twist_subframes}"
         out="{subframe}"
       >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/pick_object.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/pick_object.xml
@@ -40,11 +40,7 @@
           adjusted_poses="{adjusted_poses}"
         />
       </Control>
-      <Decorator
-        ID="ForEachPoseStamped"
-        vector_in="{adjusted_poses}"
-        out="{grasp_pose}"
-      >
+      <Decorator ID="ForEach" vector_in="{adjusted_poses}" out="{grasp_pose}">
         <Control ID="Sequence">
           <Action
             ID="InitializeMTCTask"

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/pick_place_object.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/pick_place_object.xml
@@ -78,7 +78,7 @@
                 adjusted_poses="{adjusted_poses}"
               />
               <Decorator
-                ID="ForEachPoseStamped"
+                ID="ForEach"
                 vector_in="{adjusted_poses}"
                 out="{grasp_pose}"
               >
@@ -208,7 +208,7 @@
                             adjusted_poses="{adjusted_poses}"
                           />
                           <Decorator
-                            ID="ForEachPoseStamped"
+                            ID="ForEach"
                             vector_in="{adjusted_poses}"
                             out="{grasp_pose}"
                           >

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/push_button.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/push_button.xml
@@ -36,11 +36,7 @@
           neighbor_radius="0.1"
           output_poses="{output_poses}"
         />
-        <Decorator
-          ID="ForEachPoseStamped"
-          vector_in="{output_poses}"
-          out="{pose}"
-        >
+        <Decorator ID="ForEach" vector_in="{output_poses}" out="{pose}">
           <Control ID="Sequence">
             <Action
               ID="TransformPose"

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/push_button_ml.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/push_button_ml.xml
@@ -55,7 +55,7 @@
         camera_info="{camera_info}"
         masks3d="{masks3d}"
       />
-      <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+      <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
         <Control ID="Sequence">
           <Action
             ID="GetPointCloudFromMask3D"
@@ -81,11 +81,7 @@
         graspable_objects="{graspable_objects}"
       />
       <Decorator ID="ForceSuccess">
-        <Decorator
-          ID="ForEachGraspableObject"
-          vector_in="{graspable_objects}"
-          out="{button}"
-        >
+        <Decorator ID="ForEach" vector_in="{graspable_objects}" out="{button}">
           <Action ID="AlwaysFailure" />
         </Decorator>
       </Decorator>

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/sam_pick_object.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/sam_pick_object.xml
@@ -76,7 +76,7 @@
         camera_info="{camera_info}"
         masks3d="{masks3d}"
       />
-      <Decorator ID="ForEachMask3D" vector_in="{masks3d}" out="{mask3d}">
+      <Decorator ID="ForEach" vector_in="{masks3d}" out="{mask3d}">
         <Control ID="Sequence">
           <Action
             ID="GetPointCloudFromMask3D"
@@ -102,11 +102,7 @@
         face_separation_threshold="0.025000"
         point_cloud="{point_cloud}"
       />
-      <Decorator
-        ID="ForEachGraspableObject"
-        vector_in="{objects}"
-        out="{object}"
-      >
+      <Decorator ID="ForEach" vector_in="{objects}" out="{object}">
         <Control ID="Sequence">
           <Action
             ID="InitializeMTCTask"

diff --git a/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/teach_apriltag_grasp_offset.xml b/src/moveit_pro_ur_configs/picknik_ur_site_config/objectives/teach_apriltag_grasp_offset.xml
@@ -48,7 +48,7 @@
         output_pose="{tag_pose_world}"
       />
       <Decorator
-        ID="ForEachPoseStamped"
+        ID="ForEach"
         vector_in="{adjusted_poses}"
         out="{user_grasp_pose}"
       >