chore(avoidance): update module param file name

Signed-off-by: satoshi-ota <[email protected]>
autowarefoundation · May 30, 2024 · ec309e9 · ec309e9
1 parent 6245b76
commit ec309e9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...unch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml b/...unch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml
@@ -7,9 +7,9 @@
   <arg name="enable_all_modules_auto_mode"/>
   <arg name="is_simulation"/>
 
-  <arg name="launch_avoidance_module" default="true"/>
+  <arg name="launch_static_obstacle_avoidance" default="true"/>
   <arg name="launch_avoidance_by_lane_change_module" default="true"/>
-  <arg name="launch_dynamic_avoidance_module" default="true"/>
+  <arg name="launch_dynamic_obstacle_avoidance" default="true"/>
   <arg name="launch_lane_change_right_module" default="true"/>
   <arg name="launch_lane_change_left_module" default="true"/>
   <arg name="launch_external_request_lane_change_right_module" default="true"/>
@@ -43,12 +43,12 @@
   <let
     name="behavior_path_planner_launch_modules"
     value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'behavior_path_planner::StaticObstacleAvoidanceModuleManager, '&quot;)"
-    if="$(var launch_avoidance_module)"
+    if="$(var launch_static_obstacle_avoidance)"
   />
   <let
     name="behavior_path_planner_launch_modules"
     value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'behavior_path_planner::DynamicObstacleAvoidanceModuleManager, '&quot;)"
-    if="$(var launch_dynamic_avoidance_module)"
+    if="$(var launch_dynamic_obstacle_avoidance)"
   />
   <let
     name="behavior_path_planner_launch_modules"
@@ -206,9 +206,9 @@
       <param name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
       <param name="is_simulation" value="$(var is_simulation)"/>
       <param from="$(var behavior_path_planner_side_shift_module_param_path)"/>
-      <param from="$(var behavior_path_planner_avoidance_module_param_path)"/>
+      <param from="$(var behavior_path_planner_static_obstacle_avoidance_module_param_path)"/>
       <param from="$(var behavior_path_planner_avoidance_by_lc_module_param_path)"/>
-      <param from="$(var behavior_path_planner_dynamic_avoidance_module_param_path)"/>
+      <param from="$(var behavior_path_planner_dynamic_obstacle_avoidance_module_param_path)"/>
       <param from="$(var behavior_path_planner_lane_change_module_param_path)"/>
       <param from="$(var behavior_path_planner_goal_planner_module_param_path)"/>
       <param from="$(var behavior_path_planner_start_planner_module_param_path)"/>

diff --git a/...odule/config/dynamic_avoidance.param.yaml → ...fig/dynamic_obstacle_avoidance.param.yaml b/...odule/config/dynamic_avoidance.param.yaml → ...fig/dynamic_obstacle_avoidance.param.yaml
diff --git a/...path_dynamic_obstacle_avoidance_module/test/test_behavior_path_planner_node_interface.cpp b/...path_dynamic_obstacle_avoidance_module/test/test_behavior_path_planner_node_interface.cpp
@@ -62,7 +62,7 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
                    behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
                    ament_index_cpp::get_package_share_directory(
                      "autoware_behavior_path_dynamic_obstacle_avoidance_module") +
-                     "/config/dynamic_avoidance.param.yaml"});
+                     "/config/dynamic_obstacle_avoidance.param.yaml"});
 
   return std::make_shared<BehaviorPathPlannerNode>(node_options);
 }

diff --git a/...idance_module/config/avoidance.param.yaml → ...nfig/static_obstacle_avoidance.param.yaml b/...idance_module/config/avoidance.param.yaml → ...nfig/static_obstacle_avoidance.param.yaml
diff --git a/..._path_static_obstacle_avoidance_module/test/test_behavior_path_planner_node_interface.cpp b/..._path_static_obstacle_avoidance_module/test/test_behavior_path_planner_node_interface.cpp
@@ -62,7 +62,7 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
                    behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
                    ament_index_cpp::get_package_share_directory(
                      "autoware_behavior_path_static_obstacle_avoidance_module") +
-                     "/config/avoidance.param.yaml"});
+                     "/config/static_obstacle_avoidance.param.yaml"});
 
   return std::make_shared<BehaviorPathPlannerNode>(node_options);
 }