From 5fbefe41369c28f81676e8776da5ac867884c919 Mon Sep 17 00:00:00 2001 From: kosuke55 Date: Mon, 17 Jun 2024 18:33:31 +0900 Subject: [PATCH] autoware_behavior_path_static_obstacle_avoidance_module Signed-off-by: kosuke55 --- .../data_structs.hpp | 2 +- .../debug.hpp | 4 ++-- .../helper.hpp | 6 +++--- .../manager.hpp | 4 ++-- .../parameter_helper.hpp | 2 +- .../scene.hpp | 8 ++++---- .../shift_line_generator.hpp | 6 +++--- .../type_alias.hpp | 0 .../utils.hpp | 2 +- .../src/debug.cpp | 2 +- .../src/manager.cpp | 4 ++-- .../src/scene.cpp | 6 +++--- .../src/shift_line_generator.cpp | 4 ++-- .../src/utils.cpp | 4 ++-- .../test/test_utils.cpp | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/data_structs.hpp (99%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/debug.hpp (95%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/helper.hpp (98%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/manager.hpp (93%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/parameter_helper.hpp (99%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/scene.hpp (98%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/shift_line_generator.hpp (97%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/type_alias.hpp (100%) rename planning/autoware_behavior_path_static_obstacle_avoidance_module/include/{autoware_behavior_path_static_obstacle_avoidance_module => autoware/behavior_path_static_obstacle_avoidance_module}/utils.hpp (99%) diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp similarity index 99% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp index abbdbfdc2f1e6..5ac8de219e65a 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp @@ -18,7 +18,7 @@ #include "autoware_behavior_path_planner_common/data_manager.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp" #include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp" #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/debug.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/debug.hpp similarity index 95% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/debug.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/debug.hpp index 043da5cbaf8cc..9ba576f63c4d8 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/debug.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/debug.hpp @@ -15,8 +15,8 @@ #ifndef AUTOWARE_BEHAVIOR_PATH_STATIC_OBSTACLE_AVOIDANCE_MODULE__DEBUG_HPP_ #define AUTOWARE_BEHAVIOR_PATH_STATIC_OBSTACLE_AVOIDANCE_MODULE__DEBUG_HPP_ -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp" #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/helper.hpp similarity index 98% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/helper.hpp index 5d1dc168f6efe..f62056f49ce4f 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/helper.hpp @@ -16,9 +16,9 @@ #define AUTOWARE_BEHAVIOR_PATH_STATIC_OBSTACLE_AVOIDANCE_MODULE__HELPER_HPP_ #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp" #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/manager.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/manager.hpp similarity index 93% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/manager.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/manager.hpp index f3acf0c5f3abc..4a367ba0f16be 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/manager.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/manager.hpp @@ -16,8 +16,8 @@ #define AUTOWARE_BEHAVIOR_PATH_STATIC_OBSTACLE_AVOIDANCE_MODULE__MANAGER_HPP_ #include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/scene.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/scene.hpp" #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp similarity index 99% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp index 351c686f761d7..e4b822ab41f30 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp @@ -16,7 +16,7 @@ #include "tier4_autoware_utils/ros/parameter.hpp" -#include +#include #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/scene.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/scene.hpp similarity index 98% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/scene.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/scene.hpp index ccd00078bdec1..c3903d304609b 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/scene.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/scene.hpp @@ -17,10 +17,10 @@ #include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp" #include "autoware_behavior_path_planner_common/interface/scene_module_visitor.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/helper.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp" #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp similarity index 97% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp index 8ca24db8042e7..4ed7dd60765f1 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp @@ -16,9 +16,9 @@ #define AUTOWARE_BEHAVIOR_PATH_STATIC_OBSTACLE_AVOIDANCE_MODULE__SHIFT_LINE_GENERATOR_HPP_ #include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/helper.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp" #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp similarity index 100% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/type_alias.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/type_alias.hpp diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp similarity index 99% rename from planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp rename to planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp index dc061457f7045..0384737df3e57 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/include/autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp @@ -17,7 +17,7 @@ #include "autoware_behavior_path_planner_common/data_manager.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/debug.cpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/debug.cpp index a495213626e22..a966529d785a2 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/debug.cpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/debug.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_behavior_path_static_obstacle_avoidance_module/debug.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/debug.hpp" #include "autoware_behavior_path_planner_common/marker_utils/utils.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/manager.cpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/manager.cpp index b59af0fbbf0e5..db125f066ab03 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/manager.cpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/manager.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_behavior_path_static_obstacle_avoidance_module/manager.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/manager.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp" #include "tier4_autoware_utils/ros/parameter.hpp" #include "tier4_autoware_utils/ros/update_param.hpp" diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/scene.cpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/scene.cpp index b69508c9fdcef..bb45522c3a56f 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/scene.cpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/scene.cpp @@ -12,8 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_behavior_path_static_obstacle_avoidance_module/scene.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/scene.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/debug.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp" #include "autoware_behavior_path_planner_common/interface/scene_module_visitor.hpp" #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/objects_filtering.hpp" @@ -21,8 +23,6 @@ #include "autoware_behavior_path_planner_common/utils/path_utils.hpp" #include "autoware_behavior_path_planner_common/utils/traffic_light_utils.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/debug.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp" #include #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/shift_line_generator.cpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/shift_line_generator.cpp index cdb89daad8adc..57b1078517f60 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/shift_line_generator.cpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/shift_line_generator.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/shift_line_generator.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp" namespace autoware::behavior_path_planner::utils::static_obstacle_avoidance { diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/utils.cpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/utils.cpp index d04a0e0281cd2..ef91f20ed548e 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/utils.cpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/src/utils.cpp @@ -14,12 +14,12 @@ #include "autoware_behavior_path_planner_common/utils/utils.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp" #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/objects_filtering.hpp" #include "autoware_behavior_path_planner_common/utils/path_utils.hpp" #include "autoware_behavior_path_planner_common/utils/traffic_light_utils.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp" #include diff --git a/planning/autoware_behavior_path_static_obstacle_avoidance_module/test/test_utils.cpp b/planning/autoware_behavior_path_static_obstacle_avoidance_module/test/test_utils.cpp index 110a5d39a8100..bafe50b12edc3 100644 --- a/planning/autoware_behavior_path_static_obstacle_avoidance_module/test/test_utils.cpp +++ b/planning/autoware_behavior_path_static_obstacle_avoidance_module/test/test_utils.cpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp" -#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/data_structs.hpp" +#include "autoware/behavior_path_static_obstacle_avoidance_module/utils.hpp" #include #include