diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6a51c4637c986..29b17562a2c19 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -164,7 +164,7 @@ planning/autoware_planning_topic_converter/** kosuke.takeuchi@tier4.jp satoshi.o planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.ai planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp planning/autoware_velocity_smoother/** fumiya.watanabe@tier4.jp makoto.kurihara@tier4.jp satoshi.ota@tier4.jp takamasa.horibe@tier4.jp -planning/behavior_path_goal_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp +planning/autoware_behavior_path_goal_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp planning/autoware_behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp planning/behavior_path_planner/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp planning/behavior_path_sampling_planner_module/** daniel.sanchez@tier4.jp maxime.clement@tier4.jp @@ -244,9 +244,8 @@ system/system_monitor/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp system/topic_state_monitor/** ryohsuke.mitsudome@tier4.jp system/velodyne_monitor/** fumihito.ito@tier4.jp tools/reaction_analyzer/** berkay@leodrive.ai -vehicle/accel_brake_map_calibrator/** taiki.tanaka@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp +vehicle/autoware_accel_brake_map_calibrator/** taiki.tanaka@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp vehicle/autoware_external_cmd_converter/** takamasa.horibe@tier4.jp -vehicle/autoware_steer_offset_estimator/** taiki.tanaka@tier4.jp vehicle/autoware_raw_vehicle_cmd_converter/** makoto.kurihara@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp vehicle/autoware_steer_offset_estimator/** taiki.tanaka@tier4.jp vehicle/autoware_vehicle_info_utils/** shumpei.wakabayashi@tier4.jp taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp diff --git a/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp b/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp index 2c4da0b95b161..611984a4612d9 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp +++ b/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_crosswalk_traffic_light_estimator/node.hpp" +#include "crosswalk_traffic_light_estimator/node.hpp" #include #include diff --git a/planning/behavior_path_goal_planner_module/CMakeLists.txt b/planning/autoware_behavior_path_goal_planner_module/CMakeLists.txt similarity index 90% rename from planning/behavior_path_goal_planner_module/CMakeLists.txt rename to planning/autoware_behavior_path_goal_planner_module/CMakeLists.txt index c91289bf29e2c..c6f008a624960 100644 --- a/planning/behavior_path_goal_planner_module/CMakeLists.txt +++ b/planning/autoware_behavior_path_goal_planner_module/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(behavior_path_goal_planner_module) +project(autoware_behavior_path_goal_planner_module) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/planning/behavior_path_goal_planner_module/README.md b/planning/autoware_behavior_path_goal_planner_module/README.md similarity index 100% rename from planning/behavior_path_goal_planner_module/README.md rename to planning/autoware_behavior_path_goal_planner_module/README.md diff --git a/planning/behavior_path_goal_planner_module/config/goal_planner.param.yaml b/planning/autoware_behavior_path_goal_planner_module/config/goal_planner.param.yaml similarity index 100% rename from planning/behavior_path_goal_planner_module/config/goal_planner.param.yaml rename to planning/autoware_behavior_path_goal_planner_module/config/goal_planner.param.yaml diff --git a/planning/behavior_path_goal_planner_module/images/arc_backward_parking.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/arc_backward_parking.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/arc_backward_parking.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/arc_backward_parking.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/arc_forward_parking.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/arc_forward_parking.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/arc_forward_parking.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/arc_forward_parking.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-collision_check_margin.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-collision_check_margin.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-collision_check_margin.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-collision_check_margin.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-deciding_path.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-deciding_path.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-deciding_path.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-deciding_path.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-goal_candidates.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-goal_candidates.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-goal_candidates.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-goal_candidates.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-goal_distance.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-goal_distance.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-goal_distance.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-goal_distance.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-is_safe.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-is_safe.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-is_safe.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-is_safe.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-longitudinal_margin.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-longitudinal_margin.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-longitudinal_margin.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-longitudinal_margin.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-object_to_avoid.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-object_to_avoid.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-object_to_avoid.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-object_to_avoid.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-refined_goal.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-refined_goal.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-refined_goal.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-refined_goal.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-safety_check.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-safety_check.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-safety_check.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-safety_check.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_planner-threads.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/goal_planner-threads.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_planner-threads.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/goal_planner-threads.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/goal_priority_object_to_avoid_rviz.png b/planning/autoware_behavior_path_goal_planner_module/images/goal_priority_object_to_avoid_rviz.png similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_priority_object_to_avoid_rviz.png rename to planning/autoware_behavior_path_goal_planner_module/images/goal_priority_object_to_avoid_rviz.png diff --git a/planning/behavior_path_goal_planner_module/images/goal_priority_rviz.png b/planning/autoware_behavior_path_goal_planner_module/images/goal_priority_rviz.png similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_priority_rviz.png rename to planning/autoware_behavior_path_goal_planner_module/images/goal_priority_rviz.png diff --git a/planning/behavior_path_goal_planner_module/images/goal_priority_with_goal.png b/planning/autoware_behavior_path_goal_planner_module/images/goal_priority_with_goal.png similarity index 100% rename from planning/behavior_path_goal_planner_module/images/goal_priority_with_goal.png rename to planning/autoware_behavior_path_goal_planner_module/images/goal_priority_with_goal.png diff --git a/planning/behavior_path_goal_planner_module/images/path_goal_refinement.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/path_goal_refinement.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/path_goal_refinement.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/path_goal_refinement.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/pull_over_freespace_parking_flowchart.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/pull_over_freespace_parking_flowchart.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/pull_over_freespace_parking_flowchart.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/pull_over_freespace_parking_flowchart.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/images/shift_parking.drawio.svg b/planning/autoware_behavior_path_goal_planner_module/images/shift_parking.drawio.svg similarity index 100% rename from planning/behavior_path_goal_planner_module/images/shift_parking.drawio.svg rename to planning/autoware_behavior_path_goal_planner_module/images/shift_parking.drawio.svg diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/default_fixed_goal_planner.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/default_fixed_goal_planner.hpp similarity index 80% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/default_fixed_goal_planner.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/default_fixed_goal_planner.hpp index 58203573d0c35..1f5a9f581371a 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/default_fixed_goal_planner.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/default_fixed_goal_planner.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__DEFAULT_FIXED_GOAL_PLANNER_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__DEFAULT_FIXED_GOAL_PLANNER_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__DEFAULT_FIXED_GOAL_PLANNER_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__DEFAULT_FIXED_GOAL_PLANNER_HPP_ -#include "behavior_path_goal_planner_module/fixed_goal_planner_base.hpp" +#include "autoware_behavior_path_goal_planner_module/fixed_goal_planner_base.hpp" #include @@ -42,4 +42,4 @@ class DefaultFixedGoalPlanner : public FixedGoalPlannerBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__DEFAULT_FIXED_GOAL_PLANNER_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__DEFAULT_FIXED_GOAL_PLANNER_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/fixed_goal_planner_base.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/fixed_goal_planner_base.hpp similarity index 85% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/fixed_goal_planner_base.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/fixed_goal_planner_base.hpp index 4a29553802e23..891f8b838dae9 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/fixed_goal_planner_base.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/fixed_goal_planner_base.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FIXED_GOAL_PLANNER_BASE_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FIXED_GOAL_PLANNER_BASE_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FIXED_GOAL_PLANNER_BASE_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FIXED_GOAL_PLANNER_BASE_HPP_ #include "autoware_behavior_path_planner_common/data_manager.hpp" @@ -50,4 +50,4 @@ class FixedGoalPlannerBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FIXED_GOAL_PLANNER_BASE_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FIXED_GOAL_PLANNER_BASE_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/freespace_pull_over.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/freespace_pull_over.hpp similarity index 84% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/freespace_pull_over.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/freespace_pull_over.hpp index f05d0b9b3b973..2123ee4fa5b2b 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/freespace_pull_over.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/freespace_pull_over.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FREESPACE_PULL_OVER_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FREESPACE_PULL_OVER_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FREESPACE_PULL_OVER_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FREESPACE_PULL_OVER_HPP_ -#include "behavior_path_goal_planner_module/pull_over_planner_base.hpp" +#include "autoware_behavior_path_goal_planner_module/pull_over_planner_base.hpp" #include #include @@ -51,4 +51,4 @@ class FreespacePullOver : public PullOverPlannerBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FREESPACE_PULL_OVER_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__FREESPACE_PULL_OVER_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/geometric_pull_over.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/geometric_pull_over.hpp similarity index 88% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/geometric_pull_over.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/geometric_pull_over.hpp index 903655b64e347..3bb643adc39a5 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/geometric_pull_over.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/geometric_pull_over.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GEOMETRIC_PULL_OVER_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GEOMETRIC_PULL_OVER_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GEOMETRIC_PULL_OVER_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GEOMETRIC_PULL_OVER_HPP_ +#include "autoware_behavior_path_goal_planner_module/pull_over_planner_base.hpp" #include "autoware_behavior_path_planner_common/utils/parking_departure/geometric_parallel_parking.hpp" -#include "behavior_path_goal_planner_module/pull_over_planner_base.hpp" #include @@ -65,4 +65,4 @@ class GeometricPullOver : public PullOverPlannerBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GEOMETRIC_PULL_OVER_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GEOMETRIC_PULL_OVER_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_planner_module.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_planner_module.hpp similarity index 97% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_planner_module.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_planner_module.hpp index 66f7274f888be..53ac507fd6516 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_planner_module.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_planner_module.hpp @@ -12,21 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_MODULE_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_MODULE_HPP_ - +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_MODULE_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_MODULE_HPP_ + +#include "autoware_behavior_path_goal_planner_module/default_fixed_goal_planner.hpp" +#include "autoware_behavior_path_goal_planner_module/freespace_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/geometric_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/goal_planner_parameters.hpp" +#include "autoware_behavior_path_goal_planner_module/goal_searcher.hpp" +#include "autoware_behavior_path_goal_planner_module/shift_pull_over.hpp" #include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp" #include "autoware_behavior_path_planner_common/utils/occupancy_grid_based_collision_detector/occupancy_grid_based_collision_detector.hpp" #include "autoware_behavior_path_planner_common/utils/parking_departure/common_module_data.hpp" #include "autoware_behavior_path_planner_common/utils/parking_departure/geometric_parallel_parking.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "behavior_path_goal_planner_module/default_fixed_goal_planner.hpp" -#include "behavior_path_goal_planner_module/freespace_pull_over.hpp" -#include "behavior_path_goal_planner_module/geometric_pull_over.hpp" -#include "behavior_path_goal_planner_module/goal_planner_parameters.hpp" -#include "behavior_path_goal_planner_module/goal_searcher.hpp" -#include "behavior_path_goal_planner_module/shift_pull_over.hpp" #include #include @@ -668,4 +668,4 @@ class GoalPlannerModule : public SceneModuleInterface }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_MODULE_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_MODULE_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_planner_parameters.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_planner_parameters.hpp similarity index 94% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_planner_parameters.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_planner_parameters.hpp index dc992b7ed4967..25eff659d1f02 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_planner_parameters.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_planner_parameters.hpp @@ -13,8 +13,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_PARAMETERS_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_PARAMETERS_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_PARAMETERS_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_PARAMETERS_HPP_ #include "autoware_behavior_path_planner_common/utils/parking_departure/geometric_parallel_parking.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp" @@ -128,4 +128,4 @@ struct GoalPlannerParameters }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_PARAMETERS_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_PLANNER_PARAMETERS_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_searcher.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_searcher.hpp similarity index 91% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_searcher.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_searcher.hpp index af4723327732a..2061ed4c35d8f 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_searcher.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_searcher.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_HPP_ +#include "autoware_behavior_path_goal_planner_module/goal_searcher_base.hpp" #include "autoware_behavior_path_planner_common/utils/occupancy_grid_based_collision_detector/occupancy_grid_based_collision_detector.hpp" -#include "behavior_path_goal_planner_module/goal_searcher_base.hpp" #include #include @@ -72,4 +72,4 @@ class GoalSearcher : public GoalSearcherBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_searcher_base.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_searcher_base.hpp similarity index 89% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_searcher_base.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_searcher_base.hpp index 3ed5e7243b9c5..edc4bfbe813b0 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/goal_searcher_base.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/goal_searcher_base.hpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_BASE_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_BASE_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_BASE_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_BASE_HPP_ +#include "autoware_behavior_path_goal_planner_module/goal_planner_parameters.hpp" #include "autoware_behavior_path_planner_common/data_manager.hpp" #include "autoware_behavior_path_planner_common/utils/occupancy_grid_based_collision_detector/occupancy_grid_based_collision_detector.hpp" -#include "behavior_path_goal_planner_module/goal_planner_parameters.hpp" #include @@ -78,4 +78,4 @@ class GoalSearcherBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_BASE_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__GOAL_SEARCHER_BASE_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/manager.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/manager.hpp similarity index 85% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/manager.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/manager.hpp index 4b06236755df7..0032fce97d4f4 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/manager.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/manager.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__MANAGER_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__MANAGER_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__MANAGER_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__MANAGER_HPP_ +#include "autoware_behavior_path_goal_planner_module/goal_planner_module.hpp" #include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp" -#include "behavior_path_goal_planner_module/goal_planner_module.hpp" #include @@ -55,4 +55,4 @@ class GoalPlannerModuleManager : public SceneModuleManagerInterface } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__MANAGER_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__MANAGER_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/pull_over_planner_base.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/pull_over_planner_base.hpp similarity index 92% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/pull_over_planner_base.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/pull_over_planner_base.hpp index c916e6be10d9f..0a3cf20b2ae29 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/pull_over_planner_base.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/pull_over_planner_base.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__PULL_OVER_PLANNER_BASE_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__PULL_OVER_PLANNER_BASE_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__PULL_OVER_PLANNER_BASE_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__PULL_OVER_PLANNER_BASE_HPP_ +#include "autoware_behavior_path_goal_planner_module/goal_planner_parameters.hpp" #include "autoware_behavior_path_planner_common/data_manager.hpp" -#include "behavior_path_goal_planner_module/goal_planner_parameters.hpp" #include #include @@ -141,4 +141,4 @@ class PullOverPlannerBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__PULL_OVER_PLANNER_BASE_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__PULL_OVER_PLANNER_BASE_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/shift_pull_over.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/shift_pull_over.hpp similarity index 88% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/shift_pull_over.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/shift_pull_over.hpp index e7b297548083a..56538fc4a8b51 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/shift_pull_over.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/shift_pull_over.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__SHIFT_PULL_OVER_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__SHIFT_PULL_OVER_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__SHIFT_PULL_OVER_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__SHIFT_PULL_OVER_HPP_ -#include "behavior_path_goal_planner_module/pull_over_planner_base.hpp" +#include "autoware_behavior_path_goal_planner_module/pull_over_planner_base.hpp" #include @@ -59,4 +59,4 @@ class ShiftPullOver : public PullOverPlannerBase }; } // namespace behavior_path_planner -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__SHIFT_PULL_OVER_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__SHIFT_PULL_OVER_HPP_ diff --git a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/util.hpp b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/util.hpp similarity index 95% rename from planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/util.hpp rename to planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/util.hpp index 3de0ba0c99a35..469b9295c9432 100644 --- a/planning/behavior_path_goal_planner_module/include/behavior_path_goal_planner_module/util.hpp +++ b/planning/autoware_behavior_path_goal_planner_module/include/autoware_behavior_path_goal_planner_module/util.hpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef BEHAVIOR_PATH_GOAL_PLANNER_MODULE__UTIL_HPP_ -#define BEHAVIOR_PATH_GOAL_PLANNER_MODULE__UTIL_HPP_ +#ifndef AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__UTIL_HPP_ +#define AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__UTIL_HPP_ -#include "behavior_path_goal_planner_module/goal_searcher_base.hpp" +#include "autoware_behavior_path_goal_planner_module/goal_searcher_base.hpp" #include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp" #include @@ -110,4 +110,4 @@ MarkerArray createNumObjectsToAvoidTextsMarkerArray( const std_msgs::msg::ColorRGBA & color); } // namespace behavior_path_planner::goal_planner_utils -#endif // BEHAVIOR_PATH_GOAL_PLANNER_MODULE__UTIL_HPP_ +#endif // AUTOWARE_BEHAVIOR_PATH_GOAL_PLANNER_MODULE__UTIL_HPP_ diff --git a/planning/behavior_path_goal_planner_module/package.xml b/planning/autoware_behavior_path_goal_planner_module/package.xml similarity index 91% rename from planning/behavior_path_goal_planner_module/package.xml rename to planning/autoware_behavior_path_goal_planner_module/package.xml index 75ca5c264b523..e29bce5a5039a 100644 --- a/planning/behavior_path_goal_planner_module/package.xml +++ b/planning/autoware_behavior_path_goal_planner_module/package.xml @@ -1,9 +1,9 @@ - behavior_path_goal_planner_module + autoware_behavior_path_goal_planner_module 0.1.0 - The behavior_path_goal_planner_module package + The autoware_behavior_path_goal_planner_module package Kosuke Takeuchi Kyoichi Sugahara diff --git a/planning/behavior_path_goal_planner_module/plugins.xml b/planning/autoware_behavior_path_goal_planner_module/plugins.xml similarity index 70% rename from planning/behavior_path_goal_planner_module/plugins.xml rename to planning/autoware_behavior_path_goal_planner_module/plugins.xml index 6c3b557e35e7a..30025705cb194 100644 --- a/planning/behavior_path_goal_planner_module/plugins.xml +++ b/planning/autoware_behavior_path_goal_planner_module/plugins.xml @@ -1,3 +1,3 @@ - + diff --git a/planning/behavior_path_goal_planner_module/src/default_fixed_goal_planner.cpp b/planning/autoware_behavior_path_goal_planner_module/src/default_fixed_goal_planner.cpp similarity index 96% rename from planning/behavior_path_goal_planner_module/src/default_fixed_goal_planner.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/default_fixed_goal_planner.cpp index 30914935ae7e8..453595786f041 100644 --- a/planning/behavior_path_goal_planner_module/src/default_fixed_goal_planner.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/default_fixed_goal_planner.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/default_fixed_goal_planner.hpp" +#include "autoware_behavior_path_goal_planner_module/default_fixed_goal_planner.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "autoware_behavior_path_planner_common/utils/path_utils.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "behavior_path_goal_planner_module/util.hpp" #include #include diff --git a/planning/behavior_path_goal_planner_module/src/freespace_pull_over.cpp b/planning/autoware_behavior_path_goal_planner_module/src/freespace_pull_over.cpp similarity index 97% rename from planning/behavior_path_goal_planner_module/src/freespace_pull_over.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/freespace_pull_over.cpp index 0a75e5ce94f79..016cd56ae3673 100644 --- a/planning/behavior_path_goal_planner_module/src/freespace_pull_over.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/freespace_pull_over.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/freespace_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/freespace_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp" #include "autoware_behavior_path_planner_common/utils/parking_departure/utils.hpp" #include "autoware_behavior_path_planner_common/utils/path_utils.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "behavior_path_goal_planner_module/util.hpp" #include #include diff --git a/planning/behavior_path_goal_planner_module/src/geometric_pull_over.cpp b/planning/autoware_behavior_path_goal_planner_module/src/geometric_pull_over.cpp similarity index 95% rename from planning/behavior_path_goal_planner_module/src/geometric_pull_over.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/geometric_pull_over.cpp index 2f621d30ddf8e..f61aef060485c 100644 --- a/planning/behavior_path_goal_planner_module/src/geometric_pull_over.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/geometric_pull_over.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/geometric_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/geometric_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp" -#include "behavior_path_goal_planner_module/util.hpp" #include #include diff --git a/planning/behavior_path_goal_planner_module/src/goal_planner_module.cpp b/planning/autoware_behavior_path_goal_planner_module/src/goal_planner_module.cpp similarity index 99% rename from planning/behavior_path_goal_planner_module/src/goal_planner_module.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/goal_planner_module.cpp index 20fe808f51433..8ff73d5f52766 100644 --- a/planning/behavior_path_goal_planner_module/src/goal_planner_module.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/goal_planner_module.cpp @@ -12,8 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/goal_planner_module.hpp" +#include "autoware_behavior_path_goal_planner_module/goal_planner_module.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp" #include "autoware_behavior_path_planner_common/utils/parking_departure/utils.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/objects_filtering.hpp" @@ -21,7 +22,6 @@ #include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp" #include "autoware_behavior_path_planner_common/utils/path_utils.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" -#include "behavior_path_goal_planner_module/util.hpp" #include "tier4_autoware_utils/geometry/boost_polygon_utils.hpp" #include "tier4_autoware_utils/math/unit_conversion.hpp" diff --git a/planning/behavior_path_goal_planner_module/src/goal_searcher.cpp b/planning/autoware_behavior_path_goal_planner_module/src/goal_searcher.cpp similarity index 99% rename from planning/behavior_path_goal_planner_module/src/goal_searcher.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/goal_searcher.cpp index b56ae44dcf476..402a9490b9bce 100644 --- a/planning/behavior_path_goal_planner_module/src/goal_searcher.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/goal_searcher.cpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/goal_searcher.hpp" +#include "autoware_behavior_path_goal_planner_module/goal_searcher.hpp" +#include "autoware_behavior_path_goal_planner_module/util.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/utils.hpp" -#include "behavior_path_goal_planner_module/util.hpp" #include "lanelet2_extension/regulatory_elements/no_parking_area.hpp" #include "lanelet2_extension/regulatory_elements/no_stopping_area.hpp" #include "lanelet2_extension/utility/utilities.hpp" diff --git a/planning/behavior_path_goal_planner_module/src/manager.cpp b/planning/autoware_behavior_path_goal_planner_module/src/manager.cpp similarity index 99% rename from planning/behavior_path_goal_planner_module/src/manager.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/manager.cpp index bca5bb1230f38..39ceb2d5b59a0 100644 --- a/planning/behavior_path_goal_planner_module/src/manager.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/manager.cpp @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/manager.hpp" +#include "autoware_behavior_path_goal_planner_module/manager.hpp" -#include "behavior_path_goal_planner_module/util.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "tier4_autoware_utils/ros/update_param.hpp" #include diff --git a/planning/behavior_path_goal_planner_module/src/shift_pull_over.cpp b/planning/autoware_behavior_path_goal_planner_module/src/shift_pull_over.cpp similarity index 99% rename from planning/behavior_path_goal_planner_module/src/shift_pull_over.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/shift_pull_over.cpp index 0def2f74d07cf..b49bccd2d0080 100644 --- a/planning/behavior_path_goal_planner_module/src/shift_pull_over.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/shift_pull_over.cpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/shift_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/shift_pull_over.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp" #include "autoware_behavior_path_planner_common/utils/path_utils.hpp" -#include "behavior_path_goal_planner_module/util.hpp" #include #include diff --git a/planning/behavior_path_goal_planner_module/src/util.cpp b/planning/autoware_behavior_path_goal_planner_module/src/util.cpp similarity index 99% rename from planning/behavior_path_goal_planner_module/src/util.cpp rename to planning/autoware_behavior_path_goal_planner_module/src/util.cpp index 6b538b6e9c7f5..d3ad0805855ba 100644 --- a/planning/behavior_path_goal_planner_module/src/util.cpp +++ b/planning/autoware_behavior_path_goal_planner_module/src/util.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "behavior_path_goal_planner_module/util.hpp" +#include "autoware_behavior_path_goal_planner_module/util.hpp" #include "autoware_behavior_path_planner_common/utils/path_safety_checker/objects_filtering.hpp" #include "autoware_behavior_path_planner_common/utils/utils.hpp" diff --git a/planning/autoware_behavior_velocity_virtual_traffic_light_module/src/manager.cpp b/planning/autoware_behavior_velocity_virtual_traffic_light_module/src/manager.cpp index 39dca1f8f6303..69b91d11937a0 100644 --- a/planning/autoware_behavior_velocity_virtual_traffic_light_module/src/manager.cpp +++ b/planning/autoware_behavior_velocity_virtual_traffic_light_module/src/manager.cpp @@ -14,10 +14,17 @@ #include "manager.hpp" +#include "tier4_autoware_utils/geometry/boost_geometry.hpp" + #include +#include #include #include +#include + +#include + #include #include #include @@ -52,13 +59,30 @@ VirtualTrafficLightModuleManager::VirtualTrafficLightModuleManager(rclcpp::Node void VirtualTrafficLightModuleManager::launchNewModules( const tier4_planning_msgs::msg::PathWithLaneId & path) { + tier4_autoware_utils::LineString2d ego_path_linestring; + for (const auto & path_point : path.points) { + ego_path_linestring.push_back( + tier4_autoware_utils::fromMsg(path_point.point.pose.position).to_2d()); + } + for (const auto & m : planning_utils::getRegElemMapOnPath( path, planner_data_->route_handler_->getLaneletMapPtr(), planner_data_->current_odometry->pose)) { + const auto stop_line_opt = m.first->getStopLine(); + if (!stop_line_opt) { + RCLCPP_FATAL( + logger_, "No stop line at virtual_traffic_light_reg_elem_id = %ld, please fix the map!", + m.first->id()); + continue; + } + // Use lanelet_id to unregister module when the route is changed const auto lane_id = m.second.id(); const auto module_id = lane_id; - if (!isModuleRegistered(module_id)) { + if ( + !isModuleRegistered(module_id) && + boost::geometry::intersects( + ego_path_linestring, lanelet::utils::to2D(stop_line_opt.value()).basicLineString())) { registerModule(std::make_shared( module_id, lane_id, *m.first, m.second, planner_param_, logger_.get_child("virtual_traffic_light_module"), clock_)); diff --git a/planning/behavior_path_planner/README.md b/planning/behavior_path_planner/README.md index a17e1aee89557..658edce2ccb3c 100644 --- a/planning/behavior_path_planner/README.md +++ b/planning/behavior_path_planner/README.md @@ -32,7 +32,7 @@ Behavior Path Planner has following scene modules | Avoidance By Lane Change | this module generates lane change path when there is objects that should be avoid. | [LINK](../behavior_path_avoidance_by_lane_change_module/README.md) | | Lane Change | this module is performed when it is necessary and a collision check with other vehicles is cleared. | [LINK](../autoware_behavior_path_lane_change_module/README.md) | | External Lane Change | WIP | LINK | -| Goal Planner | this module is performed when ego-vehicle is in the road lane and goal is in the shoulder lane. ego-vehicle will stop at the goal. | [LINK](../behavior_path_goal_planner_module/README.md) | +| Goal Planner | this module is performed when ego-vehicle is in the road lane and goal is in the shoulder lane. ego-vehicle will stop at the goal. | [LINK](../autoware_behavior_path_goal_planner_module/README.md) | | Start Planner | this module is performed when ego-vehicle is stationary and footprint of ego-vehicle is included in shoulder lane. This module ends when ego-vehicle merges into the road. | [LINK](../autoware_behavior_path_start_planner_module/README.md) | | Side Shift | (for remote control) shift the path to left or right according to an external instruction. | [LINK](../autoware_behavior_path_side_shift_module/README.md) | diff --git a/vehicle/accel_brake_map_calibrator/CMakeLists.txt b/vehicle/autoware_accel_brake_map_calibrator/CMakeLists.txt similarity index 94% rename from vehicle/accel_brake_map_calibrator/CMakeLists.txt rename to vehicle/autoware_accel_brake_map_calibrator/CMakeLists.txt index f8aed0abb9056..d7c6d3ab25748 100644 --- a/vehicle/accel_brake_map_calibrator/CMakeLists.txt +++ b/vehicle/autoware_accel_brake_map_calibrator/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(accel_brake_map_calibrator) +project(autoware_accel_brake_map_calibrator) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/vehicle/accel_brake_map_calibrator/README.md b/vehicle/autoware_accel_brake_map_calibrator/README.md similarity index 92% rename from vehicle/accel_brake_map_calibrator/README.md rename to vehicle/autoware_accel_brake_map_calibrator/README.md index c2516eed5de3d..024c8059a169e 100644 --- a/vehicle/accel_brake_map_calibrator/README.md +++ b/vehicle/autoware_accel_brake_map_calibrator/README.md @@ -8,20 +8,20 @@ The base map, which is lexus's one by default, is updated iteratively with the l ### Launch Calibrator -After launching Autoware, run the `accel_brake_map_calibrator` by the following command and then perform autonomous driving. Note: You can collect data with manual driving if it is possible to use the same vehicle interface as during autonomous driving (e.g. using a joystick). +After launching Autoware, run the `autoware_accel_brake_map_calibrator` by the following command and then perform autonomous driving. Note: You can collect data with manual driving if it is possible to use the same vehicle interface as during autonomous driving (e.g. using a joystick). ```sh -ros2 launch accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true +ros2 launch autoware_accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true ``` Or if you want to use rosbag files, run the following commands. ```sh -ros2 launch accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true use_sim_time:=true +ros2 launch autoware_accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true use_sim_time:=true ros2 bag play --clock ``` -During the calibration with setting the parameter `progress_file_output` to true, the log file is output in [directory of *accel_brake_map_calibrator*]/config/ . You can also see accel and brake maps in [directory of *accel_brake_map_calibrator*]/config/accel_map.csv and [directory of *accel_brake_map_calibrator*]/config/brake_map.csv after calibration. +During the calibration with setting the parameter `progress_file_output` to true, the log file is output in [directory of *autoware_accel_brake_map_calibrator*]/config/ . You can also see accel and brake maps in [directory of *autoware_accel_brake_map_calibrator*]/config/accel_map.csv and [directory of *autoware_accel_brake_map_calibrator*]/config/brake_map.csv after calibration. ### Calibration plugin @@ -86,7 +86,7 @@ The process of calibration can be visualized as below. Since these scripts need The following command shows the plot of used data in the calibration. In each plot of velocity ranges, you can see the distribution of the relationship between pedal and acceleration, and raw data points with colors according to their pitch angles. ```sh -ros2 run accel_brake_map_calibrator view_plot.py +ros2 run autoware_accel_brake_map_calibrator view_plot.py ``` ![sample pic](media/log_sample.png) @@ -102,7 +102,7 @@ The following command shows the statistics of the calibration: of all data in each map cell. ```sh -ros2 run accel_brake_map_calibrator view_statistics.py +ros2 run autoware_accel_brake_map_calibrator view_statistics.py ``` ![sample pic2](media/statistics_sample.png) @@ -141,7 +141,7 @@ You can also save accel and brake map in the default directory where Autoware re | pedal_accel_graph_output | bool | if true, it will output a log of the pedal accel graph. | true | | progress_file_output | bool | if true, it will output a log and csv file of the update process. | false | | default_map_dir | str | directory of default map | [directory of *autoware_raw_vehicle_cmd_converter*]/data/default/ | -| calibrated_map_dir | str | directory of calibrated map | [directory of *accel_brake_map_calibrator*]/config/ | +| calibrated_map_dir | str | directory of calibrated map | [directory of *autoware_accel_brake_map_calibrator*]/config/ | | update_hz | double | hz for update | 10.0 | ## Algorithm Parameters @@ -176,9 +176,9 @@ These scripts are useful to test for accel brake map calibration. These generate The `accel/brake_tester.py` receives a target accel/brake command from CLI. It sends a target value to `actuation_cmd_publisher.py` which generates the `ActuationCmd`. You can run these scripts by the following commands in the different terminals, and it will be as in the screenshot below. ```bash -ros2 run accel_brake_map_calibrator accel_tester.py -ros2 run accel_brake_map_calibrator brake_tester.py -ros2 run accel_brake_map_calibrator actuation_cmd_publisher.py +ros2 run autoware_accel_brake_map_calibrator accel_tester.py +ros2 run autoware_accel_brake_map_calibrator brake_tester.py +ros2 run autoware_accel_brake_map_calibrator actuation_cmd_publisher.py ``` ![actuation_cmd_publisher_util](./media/actuation_cmd_publisher_util.png) diff --git a/vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml b/vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml similarity index 100% rename from vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml rename to vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml diff --git a/vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml b/vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml similarity index 100% rename from vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml rename to vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml diff --git a/vehicle/accel_brake_map_calibrator/data/accel_map.csv b/vehicle/autoware_accel_brake_map_calibrator/data/accel_map.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/accel_map.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/accel_map.csv diff --git a/vehicle/accel_brake_map_calibrator/data/accel_map_double_res.csv b/vehicle/autoware_accel_brake_map_calibrator/data/accel_map_double_res.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/accel_map_double_res.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/accel_map_double_res.csv diff --git a/vehicle/accel_brake_map_calibrator/data/brake_map.csv b/vehicle/autoware_accel_brake_map_calibrator/data/brake_map.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/brake_map.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/brake_map.csv diff --git a/vehicle/accel_brake_map_calibrator/data/brake_map_double_res.csv b/vehicle/autoware_accel_brake_map_calibrator/data/brake_map_double_res.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/brake_map_double_res.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/brake_map_double_res.csv diff --git a/vehicle/accel_brake_map_calibrator/include/accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp b/vehicle/autoware_accel_brake_map_calibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp similarity index 97% rename from vehicle/accel_brake_map_calibrator/include/accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp rename to vehicle/autoware_accel_brake_map_calibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp index e168def1b8ea5..ae20df45a0f93 100644 --- a/vehicle/accel_brake_map_calibrator/include/accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp +++ b/vehicle/autoware_accel_brake_map_calibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ -#define ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ +#ifndef AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ +#define AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ #include "autoware_raw_vehicle_cmd_converter/accel_map.hpp" #include "autoware_raw_vehicle_cmd_converter/brake_map.hpp" @@ -53,7 +53,7 @@ #include #include -namespace accel_brake_map_calibrator +namespace autoware::accel_brake_map_calibrator { using autoware::raw_vehicle_cmd_converter::AccelMap; @@ -376,6 +376,6 @@ class AccelBrakeMapCalibrator : public rclcpp::Node explicit AccelBrakeMapCalibrator(const rclcpp::NodeOptions & node_options); }; -} // namespace accel_brake_map_calibrator +} // namespace autoware::accel_brake_map_calibrator -#endif // ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ +#endif // AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ diff --git a/vehicle/accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml b/vehicle/autoware_accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml similarity index 72% rename from vehicle/accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml rename to vehicle/autoware_accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml index 37ee49fe3c4e0..1ff983149d2f9 100644 --- a/vehicle/accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml +++ b/vehicle/autoware_accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml @@ -1,8 +1,8 @@ - + - + @@ -11,7 +11,7 @@ - + @@ -20,16 +20,16 @@ - + - + - + diff --git a/vehicle/accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png b/vehicle/autoware_accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png rename to vehicle/autoware_accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png diff --git a/vehicle/accel_brake_map_calibrator/media/add_panel.png b/vehicle/autoware_accel_brake_map_calibrator/media/add_panel.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/add_panel.png rename to vehicle/autoware_accel_brake_map_calibrator/media/add_panel.png diff --git a/vehicle/accel_brake_map_calibrator/media/calib_rviz_image_sample.png b/vehicle/autoware_accel_brake_map_calibrator/media/calib_rviz_image_sample.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/calib_rviz_image_sample.png rename to vehicle/autoware_accel_brake_map_calibrator/media/calib_rviz_image_sample.png diff --git a/vehicle/accel_brake_map_calibrator/media/calibrator_button_panel.png b/vehicle/autoware_accel_brake_map_calibrator/media/calibrator_button_panel.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/calibrator_button_panel.png rename to vehicle/autoware_accel_brake_map_calibrator/media/calibrator_button_panel.png diff --git a/vehicle/accel_brake_map_calibrator/media/fourcell_RLS.png b/vehicle/autoware_accel_brake_map_calibrator/media/fourcell_RLS.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/fourcell_RLS.png rename to vehicle/autoware_accel_brake_map_calibrator/media/fourcell_RLS.png diff --git a/vehicle/accel_brake_map_calibrator/media/log_sample.png b/vehicle/autoware_accel_brake_map_calibrator/media/log_sample.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/log_sample.png rename to vehicle/autoware_accel_brake_map_calibrator/media/log_sample.png diff --git a/vehicle/accel_brake_map_calibrator/media/push_calibration_button.png b/vehicle/autoware_accel_brake_map_calibrator/media/push_calibration_button.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/push_calibration_button.png rename to vehicle/autoware_accel_brake_map_calibrator/media/push_calibration_button.png diff --git a/vehicle/accel_brake_map_calibrator/media/statistics_sample.png b/vehicle/autoware_accel_brake_map_calibrator/media/statistics_sample.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/statistics_sample.png rename to vehicle/autoware_accel_brake_map_calibrator/media/statistics_sample.png diff --git a/vehicle/accel_brake_map_calibrator/package.xml b/vehicle/autoware_accel_brake_map_calibrator/package.xml similarity index 96% rename from vehicle/accel_brake_map_calibrator/package.xml rename to vehicle/autoware_accel_brake_map_calibrator/package.xml index 0fb299b199742..b2e3b97620272 100644 --- a/vehicle/accel_brake_map_calibrator/package.xml +++ b/vehicle/autoware_accel_brake_map_calibrator/package.xml @@ -1,7 +1,7 @@ - accel_brake_map_calibrator + autoware_accel_brake_map_calibrator 0.1.0 The accel_brake_map_calibrator Tomoya Kimura diff --git a/vehicle/accel_brake_map_calibrator/rviz/occupancy.rviz b/vehicle/autoware_accel_brake_map_calibrator/rviz/occupancy.rviz similarity index 100% rename from vehicle/accel_brake_map_calibrator/rviz/occupancy.rviz rename to vehicle/autoware_accel_brake_map_calibrator/rviz/occupancy.rviz diff --git a/vehicle/accel_brake_map_calibrator/scripts/__init__.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/__init__.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/__init__.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/__init__.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/accel_tester.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/accel_tester.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/accel_tester.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/accel_tester.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/brake_tester.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/brake_tester.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/brake_tester.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/brake_tester.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/calc_utils.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/calc_utils.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/calc_utils.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/calc_utils.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/config.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/config.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/config.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/config.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/csv_reader.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/csv_reader.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/csv_reader.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/csv_reader.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/delay_estimator.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/delay_estimator.py similarity index 98% rename from vehicle/accel_brake_map_calibrator/scripts/delay_estimator.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/delay_estimator.py index eb2bce380fd92..c2849513e3f54 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/delay_estimator.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/delay_estimator.py @@ -29,7 +29,7 @@ class DelayEstimator(Node): def __init__(self): # get parameter super().__init__("delay_estimator") - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter("log_file", package_path + "/config/log.csv") log_file = self.get_parameter("log_file").get_parameter_value().string_value self.declare_parameter("velocity_min_threshold", 0.1) diff --git a/vehicle/accel_brake_map_calibrator/scripts/log_analyzer.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/log_analyzer.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/log_analyzer.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/log_analyzer.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py similarity index 99% rename from vehicle/accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py index 35bcfd09eaa38..8d04faccc5679 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py @@ -50,7 +50,7 @@ def __init__(self): .string_value ) - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter( "/accel_brake_map_calibrator/csv_calibrated_map_dir", package_path + "/config/" ) diff --git a/vehicle/accel_brake_map_calibrator/scripts/plotter.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/plotter.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/plotter.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/plotter.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/view_plot.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_plot.py similarity index 98% rename from vehicle/accel_brake_map_calibrator/scripts/view_plot.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/view_plot.py index 8041f361be3ce..2f1815b3dcf3a 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/view_plot.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_plot.py @@ -56,7 +56,7 @@ def __init__(self, args): ) if calibrated_map_dir is None: - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter( "/accel_brake_map_calibrator/csv_calibrated_map_dir", package_path + "/config/" ) @@ -269,7 +269,7 @@ def main(args=None): if __name__ == "__main__": - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") parser = argparse.ArgumentParser() parser.add_argument( "-d", "--default-map-dir", default=None, type=str, help="directory of default map" diff --git a/vehicle/accel_brake_map_calibrator/scripts/view_statistics.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_statistics.py similarity index 98% rename from vehicle/accel_brake_map_calibrator/scripts/view_statistics.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/view_statistics.py index 83cfb8693b0e6..decc947e6850f 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/view_statistics.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_statistics.py @@ -28,7 +28,7 @@ class ViewPlot(Node): def __init__(self): super().__init__("statistics_viewer") # get parameter - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter("log_file", package_path + "/config/log.csv") log_file = self.get_parameter("log_file").get_parameter_value().string_value self.declare_parameter("velocity_min_threshold", 0.1) diff --git a/vehicle/accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp b/vehicle/autoware_accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp similarity index 99% rename from vehicle/accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp rename to vehicle/autoware_accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp index 37f0a11165df3..8c1a35c263712 100644 --- a/vehicle/accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp +++ b/vehicle/autoware_accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" +#include "autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" #include "rclcpp/logging.hpp" @@ -26,7 +26,7 @@ #include #include -namespace accel_brake_map_calibrator +namespace autoware::accel_brake_map_calibrator { AccelBrakeMapCalibrator::AccelBrakeMapCalibrator(const rclcpp::NodeOptions & node_options) @@ -305,6 +305,7 @@ void AccelBrakeMapCalibrator::timerCallback() // lack of data RCLCPP_WARN_STREAM_THROTTLE( get_logger(), *get_clock(), 5000, "lack of topics (twist, steer, accel, brake)"); + lack_of_data_count_++; return; } @@ -1691,4 +1692,4 @@ void AccelBrakeMapCalibrator::addLogToCSV( << ", " << new_accel_mse << "," << rmse_rate << std::endl; } -} // namespace accel_brake_map_calibrator +} // namespace autoware::accel_brake_map_calibrator diff --git a/vehicle/accel_brake_map_calibrator/src/main.cpp b/vehicle/autoware_accel_brake_map_calibrator/src/main.cpp similarity index 79% rename from vehicle/accel_brake_map_calibrator/src/main.cpp rename to vehicle/autoware_accel_brake_map_calibrator/src/main.cpp index 01dfe20307f80..df3a5cf470b6b 100644 --- a/vehicle/accel_brake_map_calibrator/src/main.cpp +++ b/vehicle/autoware_accel_brake_map_calibrator/src/main.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" +#include "autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" #include @@ -22,7 +22,8 @@ int main(int argc, char ** argv) { rclcpp::init(argc, argv); rclcpp::NodeOptions node_options; - rclcpp::spin(std::make_shared(node_options)); + rclcpp::spin( + std::make_shared(node_options)); rclcpp::shutdown(); return 0; } diff --git a/vehicle/accel_brake_map_calibrator/test/plot_csv_client_node.py b/vehicle/autoware_accel_brake_map_calibrator/test/plot_csv_client_node.py similarity index 97% rename from vehicle/accel_brake_map_calibrator/test/plot_csv_client_node.py rename to vehicle/autoware_accel_brake_map_calibrator/test/plot_csv_client_node.py index 1bbb5820bd24a..1771df7bff562 100755 --- a/vehicle/accel_brake_map_calibrator/test/plot_csv_client_node.py +++ b/vehicle/autoware_accel_brake_map_calibrator/test/plot_csv_client_node.py @@ -82,7 +82,7 @@ def main(args=None): if __name__ == "__main__": - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") parser = argparse.ArgumentParser() parser.add_argument( "-d", "--default-map-dir", default=None, type=str, help="directory of default map" diff --git a/vehicle/accel_brake_map_calibrator/test/sim_actuation_status_publisher.py b/vehicle/autoware_accel_brake_map_calibrator/test/sim_actuation_status_publisher.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/test/sim_actuation_status_publisher.py rename to vehicle/autoware_accel_brake_map_calibrator/test/sim_actuation_status_publisher.py diff --git a/vehicle/autoware_raw_vehicle_cmd_converter/README.md b/vehicle/autoware_raw_vehicle_cmd_converter/README.md index c204346d9d834..25e816e6f8692 100644 --- a/vehicle/autoware_raw_vehicle_cmd_converter/README.md +++ b/vehicle/autoware_raw_vehicle_cmd_converter/README.md @@ -22,7 +22,7 @@ Once the acceleration map is crafted, it should be loaded when the RawVehicleCmd ### Auto-Calibration Tool -For ease of calibration and adjustments to the lookup table, an auto-calibration tool is available. More information and instructions for this tool can be found [here](https://github.com/autowarefoundation/autoware.universe/blob/main/vehicle/accel_brake_map_calibrator/accel_brake_map_calibrator/README.md). +For ease of calibration and adjustments to the lookup table, an auto-calibration tool is available. More information and instructions for this tool can be found [here](https://github.com/autowarefoundation/autoware.universe/blob/main/vehicle/autoware_accel_brake_map_calibrator/README.md). ## Input topics