refactor(pose_instability_detector)!: prefix package and namespace wi…

…th autoware (autowarefoundation#8568) * add autoware_ prefix Signed-off-by: a-maumau <[email protected]> * add autoware_ prefix Signed-off-by: a-maumau <[email protected]> --------- Signed-off-by: a-maumau <[email protected]> Co-authored-by: SakodaShintaro <[email protected]>
a-maumau · Sep 2, 2024 · 8ac725d · 8ac725d
1 parent 1800001
commit 8ac725d
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 16 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -93,7 +93,7 @@ localization/localization_util/** [email protected] [email protected]
 localization/ndt_scan_matcher/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 localization/pose_estimator_arbiter/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 localization/pose_initializer/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
-localization/pose_instability_detector/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
+localization/autoware_pose_instability_detector/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 localization/yabloc/yabloc_common/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 localization/yabloc/yabloc_image_processing/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 localization/yabloc/yabloc_monitor/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]

diff --git a/...4_localization_launch/launch/pose_twist_fusion_filter/pose_twist_fusion_filter.launch.xml b/...4_localization_launch/launch/pose_twist_fusion_filter/pose_twist_fusion_filter.launch.xml
@@ -35,10 +35,10 @@
   </group>
 
   <group>
-    <include file="$(find-pkg-share pose_instability_detector)/launch/pose_instability_detector.launch.xml">
+    <include file="$(find-pkg-share autoware_pose_instability_detector)/launch/pose_instability_detector.launch.xml">
       <arg name="input_odometry" value="/localization/kinematic_state"/>
       <arg name="input_twist" value="/localization/twist_estimator/twist_with_covariance"/>
-      <arg name="param_file" value="$(find-pkg-share pose_instability_detector)/config/pose_instability_detector.param.yaml"/>
+      <arg name="param_file" value="$(find-pkg-share autoware_pose_instability_detector)/config/pose_instability_detector.param.yaml"/>
     </include>
   </group>
 </launch>
diff --git a/launch/tier4_localization_launch/package.xml b/launch/tier4_localization_launch/package.xml
@@ -23,13 +23,13 @@
   <exec_depend>autoware_gyro_odometer</exec_depend>
   <exec_depend>autoware_pointcloud_preprocessor</exec_depend>
   <exec_depend>autoware_pose_estimator_arbiter</exec_depend>
+  <exec_depend>autoware_pose_instability_detector</exec_depend>
   <exec_depend>eagleye_geo_pose_fusion</exec_depend>
   <exec_depend>eagleye_gnss_converter</exec_depend>
   <exec_depend>eagleye_rt</exec_depend>
   <exec_depend>ekf_localizer</exec_depend>
   <exec_depend>ndt_scan_matcher</exec_depend>
   <exec_depend>pose_initializer</exec_depend>
-  <exec_depend>pose_instability_detector</exec_depend>
   <exec_depend>topic_tools</exec_depend>
   <exec_depend>yabloc_common</exec_depend>
   <exec_depend>yabloc_image_processing</exec_depend>

diff --git a/.../pose_instability_detector/CMakeLists.txt → ..._pose_instability_detector/CMakeLists.txt b/.../pose_instability_detector/CMakeLists.txt → ..._pose_instability_detector/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(pose_instability_detector)
+project(autoware_pose_instability_detector)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()
@@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
 )
 
 rclcpp_components_register_node(${PROJECT_NAME}
-  PLUGIN "PoseInstabilityDetector"
+  PLUGIN "autoware::pose_instability_detector::PoseInstabilityDetector"
   EXECUTABLE ${PROJECT_NAME}_node
   EXECUTOR SingleThreadedExecutor
 )

diff --git a/...ation/pose_instability_detector/README.md → ...oware_pose_instability_detector/README.md b/...ation/pose_instability_detector/README.md → ...oware_pose_instability_detector/README.md
@@ -1,4 +1,4 @@
-# pose_instability_detector
+# autoware_pose_instability_detector
 
 The `pose_instability_detector` is a node designed to monitor the stability of `/localization/kinematic_state`, which is an output topic of the Extended Kalman Filter (EKF).
 
@@ -109,7 +109,7 @@ $$
 
 ## Parameters
 
-{{ json_to_markdown("localization/pose_instability_detector/schema/pose_instability_detector.schema.json") }}
+{{ json_to_markdown("localization/autoware_pose_instability_detector/schema/pose_instability_detector.schema.json") }}
 
 ## Input
 

diff --git a/...nfig/pose_instability_detector.param.yaml → ...nfig/pose_instability_detector.param.yaml b/...nfig/pose_instability_detector.param.yaml → ...nfig/pose_instability_detector.param.yaml
diff --git a/...ty_detector/pose_instability_detector.hpp → ...ty_detector/pose_instability_detector.hpp b/...ty_detector/pose_instability_detector.hpp → ...ty_detector/pose_instability_detector.hpp
@@ -26,6 +26,8 @@
 #include <tuple>
 #include <vector>
 
+namespace autoware::pose_instability_detector
+{
 class PoseInstabilityDetector : public rclcpp::Node
 {
   using Quaternion = geometry_msgs::msg::Quaternion;
@@ -93,5 +95,6 @@ class PoseInstabilityDetector : public rclcpp::Node
   std::optional<Odometry> prev_odometry_ = std::nullopt;
   std::deque<TwistWithCovarianceStamped> twist_buffer_;
 };
+}  // namespace autoware::pose_instability_detector
 
 #endif  // AUTOWARE__POSE_INSTABILITY_DETECTOR__POSE_INSTABILITY_DETECTOR_HPP_
diff --git a/...unch/pose_instability_detector.launch.xml → ...unch/pose_instability_detector.launch.xml b/...unch/pose_instability_detector.launch.xml → ...unch/pose_instability_detector.launch.xml
@@ -1,12 +1,12 @@
 <launch>
   <arg name="node_name" default="pose_instability_detector"/>
-  <arg name="param_file" default="$(find-pkg-share pose_instability_detector)/config/pose_instability_detector.param.yaml"/>
+  <arg name="param_file" default="$(find-pkg-share autoware_pose_instability_detector)/config/pose_instability_detector.param.yaml"/>
 
   <!-- Topics -->
   <arg name="input_odometry" default="~/input/odometry"/>
   <arg name="input_twist" default="~/input/twist"/>
 
-  <node pkg="pose_instability_detector" exec="pose_instability_detector_node" name="$(var node_name)" output="both">
+  <node pkg="autoware_pose_instability_detector" exec="autoware_pose_instability_detector_node" name="$(var node_name)" output="both">
     <remap from="~/input/odometry" to="$(var input_odometry)"/>
     <remap from="~/input/twist" to="$(var input_twist)"/>
     <param from="$(var param_file)"/>

diff --git a/...lity_detector/media/how_to_snip_twist.png → ...lity_detector/media/how_to_snip_twist.png b/...lity_detector/media/how_to_snip_twist.png → ...lity_detector/media/how_to_snip_twist.png
diff --git a/...r/media/lateral_threshold_calculation.png → ...r/media/lateral_threshold_calculation.png b/...r/media/lateral_threshold_calculation.png → ...r/media/lateral_threshold_calculation.png
diff --git a/...ia/pose_instability_detector_overview.png → ...ia/pose_instability_detector_overview.png b/...ia/pose_instability_detector_overview.png → ...ia/pose_instability_detector_overview.png
diff --git a/...ia/pose_instabilty_detector_procedure.svg → ...ia/pose_instabilty_detector_procedure.svg b/...ia/pose_instabilty_detector_procedure.svg → ...ia/pose_instabilty_detector_procedure.svg
diff --git a/...ty_detector/media/rqt_runtime_monitor.png → ...ty_detector/media/rqt_runtime_monitor.png b/...ty_detector/media/rqt_runtime_monitor.png → ...ty_detector/media/rqt_runtime_monitor.png
diff --git a/...bility_detector/media/timeline.drawio.svg → ...bility_detector/media/timeline.drawio.svg b/...bility_detector/media/timeline.drawio.svg → ...bility_detector/media/timeline.drawio.svg
diff --git a/...ion/pose_instability_detector/package.xml → ...are_pose_instability_detector/package.xml b/...ion/pose_instability_detector/package.xml → ...are_pose_instability_detector/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>pose_instability_detector</name>
+  <name>autoware_pose_instability_detector</name>
   <version>0.1.0</version>
-  <description>The pose_instability_detector package</description>
+  <description>The autoware_pose_instability_detector package</description>
   <maintainer email="[email protected]">Yamato Ando</maintainer>
   <maintainer email="[email protected]">Kento Yabuuchi</maintainer>
   <maintainer email="[email protected]">Masahiro Sakamoto</maintainer>

diff --git a/...ema/pose_instability_detector.schema.json → ...ema/pose_instability_detector.schema.json b/...ema/pose_instability_detector.schema.json → ...ema/pose_instability_detector.schema.json
diff --git a/...etector/src/pose_instability_detector.cpp → ...etector/src/pose_instability_detector.cpp b/...etector/src/pose_instability_detector.cpp → ...etector/src/pose_instability_detector.cpp
@@ -25,6 +25,8 @@
 #include <memory>
 #include <string>
 
+namespace autoware::pose_instability_detector
+{
 PoseInstabilityDetector::PoseInstabilityDetector(const rclcpp::NodeOptions & options)
 : rclcpp::Node("pose_instability_detector", options),
   timer_period_(this->declare_parameter<double>("timer_period")),
@@ -409,6 +411,7 @@ PoseInstabilityDetector::clip_out_necessary_twist(
   }
   return result_deque;
 }
+}  // namespace autoware::pose_instability_detector
 
 #include <rclcpp_components/register_node_macro.hpp>
-RCLCPP_COMPONENTS_REGISTER_NODE(PoseInstabilityDetector)
+RCLCPP_COMPONENTS_REGISTER_NODE(autoware::pose_instability_detector::PoseInstabilityDetector)
diff --git a/...n/pose_instability_detector/test/test.cpp → ...e_pose_instability_detector/test/test.cpp b/...n/pose_instability_detector/test/test.cpp → ...e_pose_instability_detector/test/test.cpp
@@ -36,7 +36,7 @@ class TestPoseInstabilityDetector : public ::testing::Test
   void SetUp() override
   {
     const std::string yaml_path =
-      ament_index_cpp::get_package_share_directory("pose_instability_detector") +
+      ament_index_cpp::get_package_share_directory("autoware_pose_instability_detector") +
       "/config/pose_instability_detector.param.yaml";
 
     rcl_params_t * params_st = rcl_yaml_node_struct_init(rcl_get_default_allocator());
@@ -53,7 +53,8 @@ class TestPoseInstabilityDetector : public ::testing::Test
       }
     }
 
-    subject_ = std::make_shared<PoseInstabilityDetector>(node_options);
+    subject_ =
+      std::make_shared<autoware::pose_instability_detector::PoseInstabilityDetector>(node_options);
     executor_.add_node(subject_);
 
     helper_ = std::make_shared<TestMessageHelperNode>();
@@ -69,7 +70,7 @@ class TestPoseInstabilityDetector : public ::testing::Test
   }
 
   rclcpp::executors::SingleThreadedExecutor executor_;
-  std::shared_ptr<PoseInstabilityDetector> subject_;
+  std::shared_ptr<autoware::pose_instability_detector::PoseInstabilityDetector> subject_;
   std::shared_ptr<TestMessageHelperNode> helper_;
 };
 

diff --git a/...etector/test/test_message_helper_node.hpp → ...etector/test/test_message_helper_node.hpp b/...etector/test/test_message_helper_node.hpp → ...etector/test/test_message_helper_node.hpp