bug(autoware_control_performance_analysis): fix inconsistent namespacing

Signed-off-by: Junya Sasaki <[email protected]>
autowarefoundation · Jan 22, 2025 · f31b17b · f31b17b
1 parent 3486a40
commit f31b17b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/control/autoware_control_performance_analysis/CMakeLists.txt b/control/autoware_control_performance_analysis/CMakeLists.txt
@@ -58,7 +58,7 @@ target_link_libraries(
 
 rclcpp_components_register_node(
         control_performance_analysis_node
-        PLUGIN "autoware::control::control_performance_analysis::ControlPerformanceAnalysisNode"
+        PLUGIN "autoware::control_performance_analysis::ControlPerformanceAnalysisNode"
         EXECUTABLE ${PROJECT_NAME}_node
 )
 

diff --git a/...lysis/include/autoware/control_performance_analysis/control_performance_analysis_core.hpp b/...lysis/include/autoware/control_performance_analysis/control_performance_analysis_core.hpp
@@ -37,7 +37,7 @@
 #include <utility>
 #include <vector>
 
-namespace autoware::control::control_performance_analysis
+namespace autoware::control_performance_analysis
 {
 using autoware_control_msgs::msg::Control;
 using autoware_control_performance_analysis::msg::DrivingMonitorStamped;
@@ -129,6 +129,6 @@ class ControlPerformanceAnalysisCore
   rclcpp::Logger logger_{rclcpp::get_logger("control_performance_analysis")};
   rclcpp::Clock clock_{RCL_ROS_TIME};
 };
-}  // namespace autoware::control::control_performance_analysis
+}  // namespace autoware::control_performance_analysis
 
 #endif  // AUTOWARE__CONTROL_PERFORMANCE_ANALYSIS__CONTROL_PERFORMANCE_ANALYSIS_CORE_HPP_
diff --git a/...lysis/include/autoware/control_performance_analysis/control_performance_analysis_node.hpp b/...lysis/include/autoware/control_performance_analysis/control_performance_analysis_node.hpp
@@ -34,7 +34,7 @@
 #include <memory>
 #include <utility>
 
-namespace autoware::control::control_performance_analysis
+namespace autoware::control_performance_analysis
 {
 using autoware_control_msgs::msg::Control;
 using autoware_control_performance_analysis::msg::DrivingMonitorStamped;
@@ -92,6 +92,6 @@ class ControlPerformanceAnalysisNode : public rclcpp::Node
   // Algorithm
   std::unique_ptr<ControlPerformanceAnalysisCore> control_performance_core_ptr_;
 };
-}  // namespace autoware::control::control_performance_analysis
+}  // namespace autoware::control_performance_analysis
 
 #endif  // AUTOWARE__CONTROL_PERFORMANCE_ANALYSIS__CONTROL_PERFORMANCE_ANALYSIS_NODE_HPP_
diff --git a/...ysis/include/autoware/control_performance_analysis/control_performance_analysis_utils.hpp b/...ysis/include/autoware/control_performance_analysis/control_performance_analysis_utils.hpp
@@ -28,7 +28,7 @@
 #include <utility>
 #include <vector>
 
-namespace autoware::control::control_performance_analysis
+namespace autoware::control_performance_analysis
 {
 namespace utils
 {
@@ -84,6 +84,6 @@ double curvatureFromThreePoints(
   std::array<double, 2> const & c);
 
 }  // namespace utils
-}  // namespace autoware::control::control_performance_analysis
+}  // namespace autoware::control_performance_analysis
 
 #endif  // AUTOWARE__CONTROL_PERFORMANCE_ANALYSIS__CONTROL_PERFORMANCE_ANALYSIS_UTILS_HPP_
diff --git a/control/autoware_control_performance_analysis/src/control_performance_analysis_core.cpp b/control/autoware_control_performance_analysis/src/control_performance_analysis_core.cpp
@@ -25,7 +25,7 @@
 #include <utility>
 #include <vector>
 
-namespace autoware::control::control_performance_analysis
+namespace autoware::control_performance_analysis
 {
 using geometry_msgs::msg::Quaternion;
 
@@ -549,4 +549,4 @@ double ControlPerformanceAnalysisCore::estimatePurePursuitCurvature()
 
   return curvature_pure_pursuit;
 }
-}  // namespace autoware::control::control_performance_analysis
+}  // namespace autoware::control_performance_analysis
diff --git a/control/autoware_control_performance_analysis/src/control_performance_analysis_node.cpp b/control/autoware_control_performance_analysis/src/control_performance_analysis_node.cpp
@@ -22,16 +22,11 @@
 #include <memory>
 #include <utility>
 
-namespace
+namespace autoware::control_performance_analysis
 {
 using autoware_control_msgs::msg::Control;
 using autoware_control_performance_analysis::msg::DrivingMonitorStamped;
 using autoware_control_performance_analysis::msg::ErrorStamped;
-
-}  // namespace
-
-namespace autoware::control::control_performance_analysis
-{
 using autoware::vehicle_info_utils::VehicleInfoUtils;
 
 ControlPerformanceAnalysisNode::ControlPerformanceAnalysisNode(
@@ -195,8 +190,8 @@ bool ControlPerformanceAnalysisNode::isValidTrajectory(const Trajectory & traj)
 
   return check_condition;
 }
-}  // namespace autoware::control::control_performance_analysis
+}  // namespace autoware::control_performance_analysis
 
 #include <rclcpp_components/register_node_macro.hpp>
 RCLCPP_COMPONENTS_REGISTER_NODE(
-  autoware::control::control_performance_analysis::ControlPerformanceAnalysisNode)
+  autoware::control_performance_analysis::ControlPerformanceAnalysisNode)
diff --git a/control/autoware_control_performance_analysis/src/control_performance_analysis_utils.cpp b/control/autoware_control_performance_analysis/src/control_performance_analysis_utils.cpp
@@ -16,7 +16,7 @@
 
 #include <algorithm>
 
-namespace autoware::control::control_performance_analysis
+namespace autoware::control_performance_analysis
 {
 namespace utils
 {
@@ -26,4 +26,4 @@ double determinant(std::array<double, 2> const & a, std::array<double, 2> const
 }
 
 }  // namespace utils
-}  // namespace autoware::control::control_performance_analysis
+}  // namespace autoware::control_performance_analysis