From 319b3a6ec34ccb96a6b5e89f8dae87c53c98999c Mon Sep 17 00:00:00 2001 From: Maxime CLEMENT Date: Fri, 7 Jun 2024 14:01:15 +0900 Subject: [PATCH] refactor(occlusion_spot): add autoware prefix Signed-off-by: Maxime CLEMENT --- .../CMakeLists.txt | 2 +- .../README.md | 0 .../config/occlusion_spot.param.yaml | 0 .../docs/behavior_after_safe_margin.drawio.svg | 0 .../docs/collision_free.drawio.svg | 0 .../docs/da.drawio.svg | 0 .../docs/maximum_slowdown_velocity.drawio.svg | 0 .../docs/object_info_partition.drawio.svg | 0 .../docs/occlusion_spot.drawio.svg | 0 .../docs/occlusion_spot.svg | 0 .../docs/raycast_shadow.drawio.svg | 0 .../docs/safe_motion.drawio.svg | 0 .../docs/velocity_planning.drawio.svg | 0 .../package.xml | 4 ++-- .../plugins.xml | 3 +++ .../src/debug.cpp | 0 .../src/grid_utils.cpp | 4 ++-- .../src/grid_utils.hpp | 4 ++++ .../src/manager.cpp | 0 .../src/manager.hpp | 0 .../src/occlusion_spot_utils.cpp | 0 .../src/occlusion_spot_utils.hpp | 0 .../src/risk_predictive_braking.cpp | 0 .../src/risk_predictive_braking.hpp | 0 .../src/scene_occlusion_spot.cpp | 0 .../src/scene_occlusion_spot.hpp | 0 .../test/src/test_grid_utils.cpp | 0 .../test/src/test_occlusion_spot_utils.cpp | 0 .../test/src/test_risk_predictive_braking.cpp | 0 .../test/src/utils.hpp | 0 30 files changed, 12 insertions(+), 5 deletions(-) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/CMakeLists.txt (93%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/README.md (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/config/occlusion_spot.param.yaml (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/behavior_after_safe_margin.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/collision_free.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/da.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/maximum_slowdown_velocity.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/object_info_partition.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/occlusion_spot.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/occlusion_spot.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/raycast_shadow.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/safe_motion.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/docs/velocity_planning.drawio.svg (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/package.xml (90%) create mode 100644 planning/autoware_behavior_velocity_occlusion_spot_module/plugins.xml rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/debug.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/grid_utils.cpp (99%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/grid_utils.hpp (97%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/manager.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/manager.hpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/occlusion_spot_utils.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/occlusion_spot_utils.hpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/risk_predictive_braking.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/risk_predictive_braking.hpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/scene_occlusion_spot.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/src/scene_occlusion_spot.hpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/test/src/test_grid_utils.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/test/src/test_occlusion_spot_utils.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/test/src/test_risk_predictive_braking.cpp (100%) rename planning/{behavior_velocity_occlusion_spot_module => autoware_behavior_velocity_occlusion_spot_module}/test/src/utils.hpp (100%) diff --git a/planning/behavior_velocity_occlusion_spot_module/CMakeLists.txt b/planning/autoware_behavior_velocity_occlusion_spot_module/CMakeLists.txt similarity index 93% rename from planning/behavior_velocity_occlusion_spot_module/CMakeLists.txt rename to planning/autoware_behavior_velocity_occlusion_spot_module/CMakeLists.txt index 8b327291a60f1..4e53e7bd1790b 100644 --- a/planning/behavior_velocity_occlusion_spot_module/CMakeLists.txt +++ b/planning/autoware_behavior_velocity_occlusion_spot_module/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(behavior_velocity_occlusion_spot_module) +project(autoware_behavior_velocity_occlusion_spot_module) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/planning/behavior_velocity_occlusion_spot_module/README.md b/planning/autoware_behavior_velocity_occlusion_spot_module/README.md similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/README.md rename to planning/autoware_behavior_velocity_occlusion_spot_module/README.md diff --git a/planning/behavior_velocity_occlusion_spot_module/config/occlusion_spot.param.yaml b/planning/autoware_behavior_velocity_occlusion_spot_module/config/occlusion_spot.param.yaml similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/config/occlusion_spot.param.yaml rename to planning/autoware_behavior_velocity_occlusion_spot_module/config/occlusion_spot.param.yaml diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/behavior_after_safe_margin.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/behavior_after_safe_margin.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/behavior_after_safe_margin.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/behavior_after_safe_margin.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/collision_free.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/collision_free.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/collision_free.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/collision_free.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/da.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/da.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/da.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/da.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/maximum_slowdown_velocity.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/maximum_slowdown_velocity.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/maximum_slowdown_velocity.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/maximum_slowdown_velocity.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/object_info_partition.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/object_info_partition.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/object_info_partition.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/object_info_partition.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/occlusion_spot.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/occlusion_spot.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/occlusion_spot.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/occlusion_spot.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/occlusion_spot.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/occlusion_spot.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/occlusion_spot.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/occlusion_spot.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/raycast_shadow.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/raycast_shadow.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/raycast_shadow.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/raycast_shadow.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/safe_motion.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/safe_motion.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/safe_motion.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/safe_motion.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/docs/velocity_planning.drawio.svg b/planning/autoware_behavior_velocity_occlusion_spot_module/docs/velocity_planning.drawio.svg similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/docs/velocity_planning.drawio.svg rename to planning/autoware_behavior_velocity_occlusion_spot_module/docs/velocity_planning.drawio.svg diff --git a/planning/behavior_velocity_occlusion_spot_module/package.xml b/planning/autoware_behavior_velocity_occlusion_spot_module/package.xml similarity index 90% rename from planning/behavior_velocity_occlusion_spot_module/package.xml rename to planning/autoware_behavior_velocity_occlusion_spot_module/package.xml index ceddd48b045a0..2f56bce7155b5 100644 --- a/planning/behavior_velocity_occlusion_spot_module/package.xml +++ b/planning/autoware_behavior_velocity_occlusion_spot_module/package.xml @@ -1,9 +1,9 @@ - behavior_velocity_occlusion_spot_module + autoware_behavior_velocity_occlusion_spot_module 0.1.0 - The behavior_velocity_occlusion_spot_module package + The autoware_behavior_velocity_occlusion_spot_module package Taiki Tanaka Tomoya Kimura diff --git a/planning/autoware_behavior_velocity_occlusion_spot_module/plugins.xml b/planning/autoware_behavior_velocity_occlusion_spot_module/plugins.xml new file mode 100644 index 0000000000000..53a2c460c2e44 --- /dev/null +++ b/planning/autoware_behavior_velocity_occlusion_spot_module/plugins.xml @@ -0,0 +1,3 @@ + + + diff --git a/planning/behavior_velocity_occlusion_spot_module/src/debug.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/debug.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/debug.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/debug.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/grid_utils.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/grid_utils.cpp similarity index 99% rename from planning/behavior_velocity_occlusion_spot_module/src/grid_utils.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/grid_utils.cpp index 427a6f27be3c4..6ab88baf77b20 100644 --- a/planning/behavior_velocity_occlusion_spot_module/src/grid_utils.cpp +++ b/planning/autoware_behavior_velocity_occlusion_spot_module/src/grid_utils.cpp @@ -39,7 +39,7 @@ Polygon2d pointsToPoly(const Point2d p0, const Point2d p1, const double radius) // std::cout << boost::geometry::wkt(line_poly) << std::endl; // std::cout << boost::geometry::wkt(line) << std::endl; - bg::correct(line_poly); + boost::geometry::correct(line_poly); return line_poly; } @@ -142,7 +142,7 @@ Polygon2d generateOccupancyPolygon(const nav_msgs::msg::MapMetaData & info, cons poly.outer().emplace_back(to_bg2d(calcOffsetPose(info.origin, r, r, 0).position)); poly.outer().emplace_back(to_bg2d(calcOffsetPose(info.origin, 0, r, 0).position)); - bg::correct(poly); + boost::geometry::correct(poly); return poly; } diff --git a/planning/behavior_velocity_occlusion_spot_module/src/grid_utils.hpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/grid_utils.hpp similarity index 97% rename from planning/behavior_velocity_occlusion_spot_module/src/grid_utils.hpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/grid_utils.hpp index 5c8d77fc831df..8dc59d07173dc 100644 --- a/planning/behavior_velocity_occlusion_spot_module/src/grid_utils.hpp +++ b/planning/autoware_behavior_velocity_occlusion_spot_module/src/grid_utils.hpp @@ -61,6 +61,10 @@ using geometry_msgs::msg::Point; using geometry_msgs::msg::TransformStamped; using nav_msgs::msg::MapMetaData; using nav_msgs::msg::OccupancyGrid; +using tier4_autoware_utils::LineString2d; +using tier4_autoware_utils::Point2d; +using tier4_autoware_utils::Polygon2d; + namespace occlusion_cost_value { static constexpr unsigned char FREE_SPACE = 0; diff --git a/planning/behavior_velocity_occlusion_spot_module/src/manager.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/manager.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/manager.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/manager.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/manager.hpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/manager.hpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/manager.hpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/manager.hpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.hpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.hpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.hpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/occlusion_spot_utils.hpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.hpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.hpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.hpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/risk_predictive_braking.hpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.hpp b/planning/autoware_behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.hpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.hpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/src/scene_occlusion_spot.hpp diff --git a/planning/behavior_velocity_occlusion_spot_module/test/src/test_grid_utils.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/test/src/test_grid_utils.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/test/src/test_grid_utils.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/test/src/test_grid_utils.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/test/src/test_occlusion_spot_utils.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/test/src/test_occlusion_spot_utils.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/test/src/test_occlusion_spot_utils.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/test/src/test_occlusion_spot_utils.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/test/src/test_risk_predictive_braking.cpp b/planning/autoware_behavior_velocity_occlusion_spot_module/test/src/test_risk_predictive_braking.cpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/test/src/test_risk_predictive_braking.cpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/test/src/test_risk_predictive_braking.cpp diff --git a/planning/behavior_velocity_occlusion_spot_module/test/src/utils.hpp b/planning/autoware_behavior_velocity_occlusion_spot_module/test/src/utils.hpp similarity index 100% rename from planning/behavior_velocity_occlusion_spot_module/test/src/utils.hpp rename to planning/autoware_behavior_velocity_occlusion_spot_module/test/src/utils.hpp