refactor(behavior_path_planenr): renaem pull_over to goal_planenr

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
autowarefoundation · Apr 26, 2023 · daecc23 · daecc23
1 parent 362cbcc
commit daecc23
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 29 deletions.
diff --git a/...nning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree.xml b/...nning/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree.xml
@@ -4,8 +4,8 @@
     <BehaviorTree ID="BehaviorTree">
         <Fallback>
             <ReactiveSequence>
-                <Condition ID="PullOver_Request"/>
-                <Action ID="PullOver_Plan" output="{output}"/>
+                <Condition ID="GoalPlanner_Request"/>
+                <Action ID="GoalPlanner_Plan" output="{output}"/>
             </ReactiveSequence>
             <ReactiveSequence>
                 <Condition ID="PullOut_Request"/>
@@ -74,10 +74,10 @@
             <output_port name="output"/>
         </Action>
         <Condition ID="PullOut_Request"/>
-        <Action ID="PullOver_Plan">
+        <Action ID="GoalPlanner_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
         </Action>
-        <Condition ID="PullOver_Request"/>
+        <Condition ID="GoalPlanner_Request"/>
         <Condition ID="SideShift_CheckApproval"/>
         <Action ID="SideShift_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>

diff --git a/...g/behavior_planning/behavior_path_planner/behavior_path_planner_tree_lane_change_only.xml b/...g/behavior_planning/behavior_path_planner/behavior_path_planner_tree_lane_change_only.xml
@@ -4,8 +4,8 @@
     <BehaviorTree ID="BehaviorTree">
         <Fallback>
             <ReactiveSequence>
-                <Condition ID="PullOver_Request"/>
-                <Action ID="PullOver_Plan" output="{output}"/>
+                <Condition ID="GoalPlanner_Request"/>
+                <Action ID="GoalPlanner_Plan" output="{output}"/>
             </ReactiveSequence>
             <ReactiveSequence>
                 <Condition ID="PullOut_Request"/>
@@ -66,10 +66,10 @@
             <output_port name="output"/>
         </Action>
         <Condition ID="PullOut_Request"/>
-        <Action ID="PullOver_Plan">
+        <Action ID="GoalPlanner_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
         </Action>
-        <Condition ID="PullOver_Request"/>
+        <Condition ID="GoalPlanner_Request"/>
         <Condition ID="SideShift_CheckApproval"/>
         <Action ID="SideShift_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>

diff --git a/...e_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_pull_out.xml b/...e_driving/behavior_planning/behavior_path_planner/behavior_path_planner_tree_pull_out.xml
@@ -4,9 +4,9 @@
     <BehaviorTree ID="BehaviorTree">
         <Fallback>
             <ReactiveSequence>
-                <Condition ID="PullOver_Request"/>
-                <Condition ID="PullOver_Ready"/>
-                <Action ID="PullOver_Plan" output="{output}"/>
+                <Condition ID="GoalPlanner_Request"/>
+                <Condition ID="GoalPlanner_Ready"/>
+                <Action ID="GoalPlanner_Plan" output="{output}"/>
             </ReactiveSequence>
             <ReactiveSequence>
                 <Condition ID="PullOut_Request"/>
@@ -78,11 +78,11 @@
         </Action>
         <Condition ID="PullOut_Ready"/>
         <Condition ID="PullOut_Request"/>
-        <Action ID="PullOver_Plan">
+        <Action ID="GoalPlanner_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
         </Action>
-        <Condition ID="PullOver_Ready"/>
-        <Condition ID="PullOver_Request"/>
+        <Condition ID="GoalPlanner_Ready"/>
+        <Condition ID="GoalPlanner_Request"/>
         <Condition ID="SideShift_CheckApproval"/>
         <Action ID="SideShift_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>

diff --git a/...or_planning/behavior_path_planner/behavior_path_planner_tree_with_external_request_LC.xml b/...or_planning/behavior_path_planner/behavior_path_planner_tree_with_external_request_LC.xml
@@ -4,8 +4,8 @@
     <BehaviorTree ID="BehaviorTree">
         <Fallback>
             <ReactiveSequence>
-                <Condition ID="PullOver_Request"/>
-                <Action ID="PullOver_Plan" output="{output}"/>
+                <Condition ID="GoalPlanner_Request"/>
+                <Action ID="GoalPlanner_Plan" output="{output}"/>
             </ReactiveSequence>
             <ReactiveSequence>
                 <Condition ID="PullOut_Request"/>
@@ -61,10 +61,10 @@
             <output_port name="output"/>
         </Action>
         <Condition ID="PullOut_Request"/>
-        <Action ID="PullOver_Plan">
+        <Action ID="GoalPlanner_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
         </Action>
-        <Condition ID="PullOver_Request"/>
+        <Condition ID="GoalPlanner_Request"/>
         <Action ID="SideShift_Plan">
             <output_port name="output" type="behavior_path_planner::BehaviorModuleOutput">desc</output_port>
         </Action>

diff --git a/...th_planner/pull_over/pull_over.param.yaml → ...nner/goal_planner/goal_planner.param.yaml b/...th_planner/pull_over/pull_over.param.yaml → ...nner/goal_planner/goal_planner.param.yaml
@@ -1,6 +1,6 @@
 /**:
   ros__parameters:
-    pull_over:
+    goal_planner:
       minimum_request_length: 100.0
       th_arrived_distance: 1.0
       th_stopped_velocity: 0.01

diff --git a/...ning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml b/...ning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml
@@ -45,7 +45,7 @@
       priority: 2
       max_module_size: 1
 
-    pull_over:
+    goal_planner:
       enable_module: true
       enable_simultaneous_execution_as_approved_module: false
       enable_simultaneous_execution_as_candidate_module: false

diff --git a/...ing/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml b/...ing/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml
@@ -13,7 +13,7 @@
       - "lane_change_right"
       - "avoidance_left"
       - "avoidance_right"
-      - "pull_over"
+      - "goal_planner"
       - "pull_out"
       - "intersection_occlusion"
 
@@ -28,6 +28,6 @@
       - "lane_change_right"
       - "avoidance_left"
       - "avoidance_right"
-      - "pull_over"
+      - "goal_planner"
       - "pull_out"
       - "intersection_occlusion"
diff --git a/autoware_launch/launch/components/tier4_planning_component.launch.xml b/autoware_launch/launch/components/tier4_planning_component.launch.xml
@@ -41,7 +41,10 @@
       name="lane_change_param_path"
       value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml"
     />
-    <arg name="pull_over_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/pull_over/pull_over.param.yaml"/>
+    <arg
+      name="goal_planner_param_path"
+      value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/goal_planner/goal_planner.param.yaml"
+    />
     <arg name="pull_out_param_path" value="$(find-pkg-share autoware_launch)/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/pull_out/pull_out.param.yaml"/>
     <arg
       name="drivable_area_expansion_param_path"

diff --git a/autoware_launch/rviz/autoware.rviz b/autoware_launch/rviz/autoware.rviz
@@ -1106,13 +1106,13 @@ Visualization Manager:
                     - Class: rviz_plugins/Path
                       Color Border Vel Max: 3
                       Enabled: false
-                      Name: PathReference_PullOver
+                      Name: PathReference_Goalplanner
                       Topic:
                         Depth: 5
                         Durability Policy: Volatile
                         History Policy: Keep Last
                         Reliability Policy: Reliable
-                        Value: /planning/path_reference/pull_over
+                        Value: /planning/path_reference/goal_planner
                       Value: true
                       View Path:
                         Alpha: 0.3
@@ -1336,13 +1336,13 @@ Visualization Manager:
                     - Class: rviz_plugins/Path
                       Color Border Vel Max: 3
                       Enabled: true
-                      Name: PathChangeCandidate_PullOver
+                      Name: PathChangeCandidate_Goalplanner
                       Topic:
                         Depth: 5
                         Durability Policy: Volatile
                         History Policy: Keep Last
                         Reliability Policy: Reliable
-                        Value: /planning/path_candidate/pull_over
+                        Value: /planning/path_candidate/goal_planner
                       Value: true
                       View Path:
                         Alpha: 0.30000001192092896
@@ -1715,15 +1715,15 @@ Visualization Manager:
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false
-                          Name: PullOver
+                          Name: Goalplanner
                           Namespaces:
                             {}
                           Topic:
                             Depth: 5
                             Durability Policy: Volatile
                             History Policy: Keep Last
                             Reliability Policy: Reliable
-                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/pull_over
+                            Value: /planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/debug/goal_planner
                           Value: false
                         - Class: rviz_default_plugins/MarkerArray
                           Enabled: false