From dc82f798d65b745fb658dcc87c9875ea0c6b3f90 Mon Sep 17 00:00:00 2001 From: Daniel Sanchez Date: Fri, 7 Jun 2024 09:39:46 +0900 Subject: [PATCH] Revert "change namespace" This reverts commit 8cf69f87612ea4084d66f83ca6a5a11da969d371. --- .../data_structs.hpp | 4 ++-- .../autoware_behavior_path_start_planner_module/debug.hpp | 4 ++-- .../freespace_pull_out.hpp | 4 ++-- .../geometric_pull_out.hpp | 4 ++-- .../autoware_behavior_path_start_planner_module/manager.hpp | 4 ++-- .../pull_out_path.hpp | 4 ++-- .../pull_out_planner_base.hpp | 4 ++-- .../shift_pull_out.hpp | 4 ++-- .../start_planner_module.hpp | 4 ++-- .../autoware_behavior_path_start_planner_module/util.hpp | 4 ++-- .../autoware_behavior_path_start_planner_module/src/debug.cpp | 4 ++-- .../src/freespace_pull_out.cpp | 4 ++-- .../src/geometric_pull_out.cpp | 4 ++-- .../src/manager.cpp | 4 ++-- .../src/shift_pull_out.cpp | 4 ++-- .../src/start_planner_module.cpp | 4 ++-- .../autoware_behavior_path_start_planner_module/src/util.cpp | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/data_structs.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/data_structs.hpp index f1f9b5d8335ca..95c98c3c89733 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/data_structs.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/data_structs.hpp @@ -26,7 +26,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using autoware_perception_msgs::msg::PredictedObjects; @@ -132,6 +132,6 @@ struct StartPlannerParameters bool print_debug_info{false}; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__DATA_STRUCTS_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/debug.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/debug.hpp index 5e1aecfea1d65..c252a8f22eda5 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/debug.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/debug.hpp @@ -20,7 +20,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using behavior_path_planner::StartPlannerDebugData; @@ -34,6 +34,6 @@ void updateSafetyCheckDebugData( data.ego_predicted_path = ego_predicted_path; } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__DEBUG_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/freespace_pull_out.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/freespace_pull_out.hpp index aa4c6277829c9..df640b04e5a72 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/freespace_pull_out.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/freespace_pull_out.hpp @@ -25,7 +25,7 @@ #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using freespace_planning_algorithms::AbstractPlanningAlgorithm; using freespace_planning_algorithms::AstarSearch; @@ -47,6 +47,6 @@ class FreespacePullOut : public PullOutPlannerBase double velocity_; bool use_back_; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__FREESPACE_PULL_OUT_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/geometric_pull_out.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/geometric_pull_out.hpp index 9b813a959802b..5edde96ea4abf 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/geometric_pull_out.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/geometric_pull_out.hpp @@ -25,7 +25,7 @@ #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { class GeometricPullOut : public PullOutPlannerBase { @@ -41,6 +41,6 @@ class GeometricPullOut : public PullOutPlannerBase ParallelParkingParameters parallel_parking_parameters_; std::shared_ptr lane_departure_checker_; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__GEOMETRIC_PULL_OUT_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/manager.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/manager.hpp index e2634c7feb34a..a7fcd6d820202 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/manager.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/manager.hpp @@ -24,7 +24,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { class StartPlannerModuleManager : public SceneModuleManagerInterface @@ -51,6 +51,6 @@ class StartPlannerModuleManager : public SceneModuleManagerInterface std::shared_ptr parameters_; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__MANAGER_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_path.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_path.hpp index d0a764b7b3f1a..5674087cdb3df 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_path.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_path.hpp @@ -22,7 +22,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using tier4_planning_msgs::msg::PathWithLaneId; struct PullOutPath @@ -33,5 +33,5 @@ struct PullOutPath Pose start_pose{}; Pose end_pose{}; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__PULL_OUT_PATH_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_planner_base.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_planner_base.hpp index bfb0da71cb4ce..8cbe3569d13fe 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_planner_base.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/pull_out_planner_base.hpp @@ -26,7 +26,7 @@ #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using geometry_msgs::msg::Pose; using tier4_autoware_utils::LinearRing2d; @@ -100,6 +100,6 @@ class PullOutPlannerBase StartPlannerParameters parameters_; double collision_check_margin_; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__PULL_OUT_PLANNER_BASE_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/shift_pull_out.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/shift_pull_out.hpp index bdb98776f209d..3092ca4f80e3f 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/shift_pull_out.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/shift_pull_out.hpp @@ -25,7 +25,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using lane_departure_checker::LaneDepartureChecker; @@ -59,6 +59,6 @@ class ShiftPullOut : public PullOutPlannerBase const double lon_acc, const double shift_time, const double shift_length, const double max_curvature, const double min_distance) const; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__SHIFT_PULL_OUT_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/start_planner_module.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/start_planner_module.hpp index dae351583ed0a..1883e10af3c62 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/start_planner_module.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/start_planner_module.hpp @@ -44,7 +44,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using behavior_path_planner::utils::path_safety_checker::EgoPredictedPathParams; using behavior_path_planner::utils::path_safety_checker::ObjectsFilteringParams; @@ -334,6 +334,6 @@ class StartPlannerModule : public SceneModuleInterface void setDebugData(); void logPullOutStatus(rclcpp::Logger::Level log_level = rclcpp::Logger::Level::Info) const; }; -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__START_PLANNER_MODULE_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/util.hpp b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/util.hpp index 9b35c8409f38c..b9f0b964ed428 100644 --- a/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/util.hpp +++ b/planning/autoware_behavior_path_start_planner_module/include/autoware_behavior_path_start_planner_module/util.hpp @@ -34,7 +34,7 @@ #include #include -namespace autoware::behavior_path_planner::start_planner_utils +namespace behavior_path_planner::start_planner_utils { using autoware_perception_msgs::msg::PredictedObjects; using autoware_perception_msgs::msg::PredictedPath; @@ -53,6 +53,6 @@ Pose getBackedPose( const Pose & current_pose, const double & yaw_shoulder_lane, const double & back_distance); std::optional extractCollisionCheckSection( const PullOutPath & path, const double collision_check_distance_from_end); -} // namespace autoware::behavior_path_planner::start_planner_utils +} // namespace behavior_path_planner::start_planner_utils #endif // AUTOWARE_BEHAVIOR_PATH_START_PLANNER_MODULE__UTIL_HPP_ diff --git a/planning/autoware_behavior_path_start_planner_module/src/debug.cpp b/planning/autoware_behavior_path_start_planner_module/src/debug.cpp index 1c07d175a3d09..4b4aa7c386925 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/debug.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/debug.cpp @@ -14,7 +14,7 @@ #include "autoware_behavior_path_start_planner_module/debug.hpp" -namespace autoware::behavior_path_planner +namespace behavior_path_planner { void updateSafetyCheckDebugData( @@ -27,4 +27,4 @@ void updateSafetyCheckDebugData( data.ego_predicted_path = ego_predicted_path; } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner diff --git a/planning/autoware_behavior_path_start_planner_module/src/freespace_pull_out.cpp b/planning/autoware_behavior_path_start_planner_module/src/freespace_pull_out.cpp index f3a4d760662e0..1dfacd45b5218 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/freespace_pull_out.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/freespace_pull_out.cpp @@ -24,7 +24,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { FreespacePullOut::FreespacePullOut( rclcpp::Node & node, const StartPlannerParameters & parameters, @@ -114,4 +114,4 @@ std::optional FreespacePullOut::plan(const Pose & start_pose, const return pull_out_path; } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner diff --git a/planning/autoware_behavior_path_start_planner_module/src/geometric_pull_out.cpp b/planning/autoware_behavior_path_start_planner_module/src/geometric_pull_out.cpp index 7e536de7b4553..86d7de246c312 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/geometric_pull_out.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/geometric_pull_out.cpp @@ -26,7 +26,7 @@ using lanelet::utils::getArcCoordinates; using motion_utils::findNearestIndex; using tier4_autoware_utils::calcDistance2d; using tier4_autoware_utils::calcOffsetPose; -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using start_planner_utils::getPullOutLanes; @@ -120,4 +120,4 @@ std::optional GeometricPullOut::plan(const Pose & start_pose, const return output; } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner diff --git a/planning/autoware_behavior_path_start_planner_module/src/manager.cpp b/planning/autoware_behavior_path_start_planner_module/src/manager.cpp index c69bab6ddf386..23cca1ef05190 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/manager.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/manager.cpp @@ -22,7 +22,7 @@ #include #include -namespace autoware::behavior_path_planner +namespace behavior_path_planner { void StartPlannerModuleManager::init(rclcpp::Node * node) { @@ -795,7 +795,7 @@ bool StartPlannerModuleManager::isSimultaneousExecutableAsCandidateModule() cons return std::all_of(observers_.begin(), observers_.end(), checker); } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner #include PLUGINLIB_EXPORT_CLASS( diff --git a/planning/autoware_behavior_path_start_planner_module/src/shift_pull_out.cpp b/planning/autoware_behavior_path_start_planner_module/src/shift_pull_out.cpp index b12601e1fb435..d0a7b827a2285 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/shift_pull_out.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/shift_pull_out.cpp @@ -31,7 +31,7 @@ using lanelet::utils::getArcCoordinates; using motion_utils::findNearestIndex; using tier4_autoware_utils::calcDistance2d; using tier4_autoware_utils::calcOffsetPose; -namespace autoware::behavior_path_planner +namespace behavior_path_planner { using start_planner_utils::getPullOutLanes; @@ -416,4 +416,4 @@ double ShiftPullOut::calcBeforeShiftedArcLength( return before_arc_length; } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner diff --git a/planning/autoware_behavior_path_start_planner_module/src/start_planner_module.cpp b/planning/autoware_behavior_path_start_planner_module/src/start_planner_module.cpp index 5e7535d33b772..c13afdf2b86df 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/start_planner_module.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/start_planner_module.cpp @@ -50,7 +50,7 @@ using tier4_autoware_utils::calcOffsetPose; #define DEBUG_PRINT(...) \ RCLCPP_DEBUG_EXPRESSION(getLogger(), parameters_->print_debug_info, __VA_ARGS__) -namespace autoware::behavior_path_planner +namespace behavior_path_planner { StartPlannerModule::StartPlannerModule( const std::string & name, rclcpp::Node & node, @@ -1831,4 +1831,4 @@ void StartPlannerModule::StartPlannerData::update( main_thread_pull_out_status = pull_out_status_; is_stopped = is_stopped_; } -} // namespace autoware::behavior_path_planner +} // namespace behavior_path_planner diff --git a/planning/autoware_behavior_path_start_planner_module/src/util.cpp b/planning/autoware_behavior_path_start_planner_module/src/util.cpp index e8197fcf095cc..51a6093936154 100644 --- a/planning/autoware_behavior_path_start_planner_module/src/util.cpp +++ b/planning/autoware_behavior_path_start_planner_module/src/util.cpp @@ -35,7 +35,7 @@ #include #include -namespace autoware::behavior_path_planner::start_planner_utils +namespace behavior_path_planner::start_planner_utils { PathWithLaneId getBackwardPath( const RouteHandler & route_handler, const lanelet::ConstLanelets & shoulder_lanes, @@ -139,4 +139,4 @@ std::optional extractCollisionCheckSection( return collision_check_section; } -} // namespace autoware::behavior_path_planner::start_planner_utils +} // namespace behavior_path_planner::start_planner_utils