From 5b951a74578081bbe0d9598e6820a1fcbabc0b0e Mon Sep 17 00:00:00 2001
From: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
Date: Wed, 22 Jan 2025 12:14:42 +0900
Subject: [PATCH 1/2] feat(deviation_estimation_tools)!: replace
 tier4_debug_msgs with tier4_internal_debug_msgs

Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
---
 .../deviation_estimator/deviation_estimator.hpp    |  4 ++--
 .../include/deviation_estimator/utils.hpp          | 14 +++++++-------
 .../deviation_estimator/velocity_coef_module.hpp   |  2 +-
 .../deviation_estimator/package.xml                |  2 +-
 .../src/deviation_estimator.cpp                    |  2 +-
 .../src/deviation_estimator_main.cpp               |  2 +-
 .../deviation_estimator/src/utils.cpp              |  6 +++---
 .../deviation_evaluator/deviation_evaluator.hpp    |  2 +-
 .../deviation_evaluator/package.xml                |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
index da44047df..59e95f7be 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
@@ -30,7 +30,7 @@
 #include "geometry_msgs/msg/twist_with_covariance_stamped.hpp"
 #include "sensor_msgs/msg/imu.hpp"
 #include "std_msgs/msg/float64.hpp"
-#include "tier4_debug_msgs/msg/float64_stamped.hpp"
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <iostream>
 #include <memory>
@@ -71,7 +71,7 @@ class DeviationEstimator : public rclcpp::Node
 
   std::string imu_link_frame_;
 
-  std::vector<tier4_debug_msgs::msg::Float64Stamped> vx_all_;
+  std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> vx_all_;
   std::vector<geometry_msgs::msg::Vector3Stamped> gyro_all_;
   std::vector<geometry_msgs::msg::PoseStamped> pose_buf_;
   std::vector<TrajectoryData> traj_data_list_for_gyro_;
diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp
index bf4a2f0a7..e13dc4b63 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp
@@ -21,7 +21,7 @@
 #include "geometry_msgs/msg/pose_stamped.hpp"
 #include "geometry_msgs/msg/transform_stamped.hpp"
 #include "geometry_msgs/msg/twist_stamped.hpp"
-#include "tier4_debug_msgs/msg/float64_stamped.hpp"
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <tf2/transform_datatypes.h>
 
@@ -39,7 +39,7 @@
 struct TrajectoryData
 {
   std::vector<geometry_msgs::msg::PoseStamped> pose_list;
-  std::vector<tier4_debug_msgs::msg::Float64Stamped> vx_list;
+  std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> vx_list;
   std::vector<geometry_msgs::msg::Vector3Stamped> gyro_list;
 };
 
@@ -95,12 +95,12 @@ double calculate_std_mean_const(const std::vector<T> & v, const double mean)
 
 struct CompareMsgTimestamp
 {
-  bool operator()(tier4_debug_msgs::msg::Float64Stamped const & t1, double const & t2) const
+  bool operator()(autoware_internal_debug_msgs::msg::Float64Stamped const & t1, double const & t2) const
   {
     return rclcpp::Time(t1.stamp).seconds() < t2;
   }
 
-  bool operator()(tier4_debug_msgs::msg::Float64Stamped const & t1, rclcpp::Time const & t2) const
+  bool operator()(autoware_internal_debug_msgs::msg::Float64Stamped const & t1, rclcpp::Time const & t2) const
   {
     return rclcpp::Time(t1.stamp).seconds() < t2.seconds();
   }
@@ -163,7 +163,7 @@ double norm_xy(const T p1, const U p2)
 double clip_radian(const double rad);
 
 geometry_msgs::msg::Point integrate_position(
-  const std::vector<tier4_debug_msgs::msg::Float64Stamped> & vx_list,
+  const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list,
   const std::vector<geometry_msgs::msg::Vector3Stamped> & gyro_list, const double coef_vx,
   const double yaw_init);
 
@@ -176,9 +176,9 @@ geometry_msgs::msg::Vector3 integrate_orientation(
   const std::vector<geometry_msgs::msg::Vector3Stamped> & gyro_list,
   const geometry_msgs::msg::Vector3 & gyro_bias);
 
-double get_mean_abs_vx(const std::vector<tier4_debug_msgs::msg::Float64Stamped> & vx_list);
+double get_mean_abs_vx(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list);
 double get_mean_abs_wz(const std::vector<geometry_msgs::msg::Vector3Stamped> & gyro_list);
-double get_mean_accel(const std::vector<tier4_debug_msgs::msg::Float64Stamped> & vx_list);
+double get_mean_accel(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list);
 
 geometry_msgs::msg::Vector3 transform_vector3(
   const geometry_msgs::msg::Vector3 & vec, const geometry_msgs::msg::TransformStamped & transform);
diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp
index 374ce03be..ad25fde4e 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp
@@ -19,7 +19,7 @@
 
 #include "geometry_msgs/msg/pose_stamped.hpp"
 #include "geometry_msgs/msg/vector3_stamped.hpp"
-#include "tier4_debug_msgs/msg/float64_stamped.hpp"
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <utility>
 #include <vector>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/package.xml b/localization/deviation_estimation_tools/deviation_estimator/package.xml
index c5e3dea01..a94028cde 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/package.xml
+++ b/localization/deviation_estimation_tools/deviation_estimator/package.xml
@@ -28,7 +28,7 @@
   <depend>tf2</depend>
   <depend>tf2_geometry_msgs</depend>
   <depend>tf2_ros</depend>
-  <depend>tier4_debug_msgs</depend>
+  <depend>autoware_internal_debug_msgs</depend>
   <exec_depend>rosbag2_storage_mcap</exec_depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp
index 5296121fb..c3dd02061 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator.cpp
@@ -202,7 +202,7 @@ void DeviationEstimator::callback_pose_with_covariance(
 void DeviationEstimator::callback_wheel_odometry(
   const autoware_vehicle_msgs::msg::VelocityReport::ConstSharedPtr wheel_odometry_msg_ptr)
 {
-  tier4_debug_msgs::msg::Float64Stamped vx;
+  autoware_internal_debug_msgs::msg::Float64Stamped vx;
   vx.stamp = wheel_odometry_msg_ptr->header.stamp;
   vx.data = wheel_odometry_msg_ptr->longitudinal_velocity;
 
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator_main.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator_main.cpp
index 59f7329e7..d5c755e60 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator_main.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/deviation_estimator_main.cpp
@@ -99,7 +99,7 @@ int main(int argc, char ** argv)
       if (index >= static_cast<int64_t>(trajectory_data_list.size())) {
         trajectory_data_list.resize(index + 1);
       }
-      tier4_debug_msgs::msg::Float64Stamped vx;
+      autoware_internal_debug_msgs::msg::Float64Stamped vx;
       vx.stamp = velocity_status_msg->header.stamp;
       vx.data = velocity_status_msg->longitudinal_velocity;
       trajectory_data_list[index].vx_list.push_back(vx);
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
index 726fd7fd8..f0478603b 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
@@ -87,7 +87,7 @@ geometry_msgs::msg::Vector3 interpolate_vector3_stamped(
  * point
  */
 geometry_msgs::msg::Point integrate_position(
-  const std::vector<tier4_debug_msgs::msg::Float64Stamped> & vx_list,
+  const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list,
   const std::vector<geometry_msgs::msg::Vector3Stamped> & gyro_list, const double coef_vx,
   const double yaw_init)
 {
@@ -153,7 +153,7 @@ geometry_msgs::msg::Vector3 integrate_orientation(
 /**
  * @brief calculate mean of |vx|
  */
-double get_mean_abs_vx(const std::vector<tier4_debug_msgs::msg::Float64Stamped> & vx_list)
+double get_mean_abs_vx(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list)
 {
   double mean_abs_vx = 0;
   for (const auto & msg : vx_list) {
@@ -179,7 +179,7 @@ double get_mean_abs_wz(const std::vector<geometry_msgs::msg::Vector3Stamped> & g
 /**
  * @brief calculate mean of acceleration
  */
-double get_mean_accel(const std::vector<tier4_debug_msgs::msg::Float64Stamped> & vx_list)
+double get_mean_accel(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list)
 {
   const double dt =
     (rclcpp::Time(vx_list.back().stamp) - rclcpp::Time(vx_list.front().stamp)).seconds();
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
index 16110088a..8f57c403d 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
+++ b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
@@ -27,7 +27,7 @@
 #include "sensor_msgs/msg/imu.hpp"
 #include "std_msgs/msg/float64.hpp"
 #include "std_srvs/srv/set_bool.hpp"
-#include "tier4_debug_msgs/msg/float64_stamped.hpp"
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <tf2/utils.h>
 
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/package.xml b/localization/deviation_estimation_tools/deviation_evaluator/package.xml
index 69a2c29d2..135152023 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/package.xml
+++ b/localization/deviation_estimation_tools/deviation_evaluator/package.xml
@@ -25,7 +25,7 @@
   <depend>std_srvs</depend>
   <depend>tf2</depend>
   <depend>tf2_ros</depend>
-  <depend>tier4_debug_msgs</depend>
+  <depend>autoware_internal_debug_msgs</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>

From 052332ab3bcde18733754fe8471b46fcb64061d1 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 00:30:52 +0000
Subject: [PATCH 2/2] style(pre-commit): autofix

---
 .../deviation_estimator/deviation_estimator.hpp    |  2 +-
 .../include/deviation_estimator/utils.hpp          | 14 +++++++++-----
 .../deviation_estimator/velocity_coef_module.hpp   |  2 +-
 .../deviation_estimator/package.xml                |  2 +-
 .../deviation_estimator/src/utils.cpp              |  6 ++++--
 .../deviation_evaluator/deviation_evaluator.hpp    |  2 +-
 .../deviation_evaluator/package.xml                |  2 +-
 7 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
index 59e95f7be..384009312 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/deviation_estimator.hpp
@@ -24,13 +24,13 @@
 #include "rclcpp/rclcpp.hpp"
 #include "tf2/utils.h"
 
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 #include "autoware_vehicle_msgs/msg/velocity_report.hpp"
 #include "geometry_msgs/msg/pose_with_covariance_stamped.hpp"
 #include "geometry_msgs/msg/transform_stamped.hpp"
 #include "geometry_msgs/msg/twist_with_covariance_stamped.hpp"
 #include "sensor_msgs/msg/imu.hpp"
 #include "std_msgs/msg/float64.hpp"
-#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <iostream>
 #include <memory>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp
index e13dc4b63..932393fc3 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/utils.hpp
@@ -18,10 +18,10 @@
 #include "deviation_estimator/autoware_universe_utils.hpp"
 #include "rclcpp/rclcpp.hpp"
 
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 #include "geometry_msgs/msg/pose_stamped.hpp"
 #include "geometry_msgs/msg/transform_stamped.hpp"
 #include "geometry_msgs/msg/twist_stamped.hpp"
-#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <tf2/transform_datatypes.h>
 
@@ -95,12 +95,14 @@ double calculate_std_mean_const(const std::vector<T> & v, const double mean)
 
 struct CompareMsgTimestamp
 {
-  bool operator()(autoware_internal_debug_msgs::msg::Float64Stamped const & t1, double const & t2) const
+  bool operator()(
+    autoware_internal_debug_msgs::msg::Float64Stamped const & t1, double const & t2) const
   {
     return rclcpp::Time(t1.stamp).seconds() < t2;
   }
 
-  bool operator()(autoware_internal_debug_msgs::msg::Float64Stamped const & t1, rclcpp::Time const & t2) const
+  bool operator()(
+    autoware_internal_debug_msgs::msg::Float64Stamped const & t1, rclcpp::Time const & t2) const
   {
     return rclcpp::Time(t1.stamp).seconds() < t2.seconds();
   }
@@ -176,9 +178,11 @@ geometry_msgs::msg::Vector3 integrate_orientation(
   const std::vector<geometry_msgs::msg::Vector3Stamped> & gyro_list,
   const geometry_msgs::msg::Vector3 & gyro_bias);
 
-double get_mean_abs_vx(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list);
+double get_mean_abs_vx(
+  const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list);
 double get_mean_abs_wz(const std::vector<geometry_msgs::msg::Vector3Stamped> & gyro_list);
-double get_mean_accel(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list);
+double get_mean_accel(
+  const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list);
 
 geometry_msgs::msg::Vector3 transform_vector3(
   const geometry_msgs::msg::Vector3 & vec, const geometry_msgs::msg::TransformStamped & transform);
diff --git a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp
index ad25fde4e..6ea4305e1 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/include/deviation_estimator/velocity_coef_module.hpp
@@ -17,9 +17,9 @@
 
 #include "deviation_estimator/utils.hpp"
 
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 #include "geometry_msgs/msg/pose_stamped.hpp"
 #include "geometry_msgs/msg/vector3_stamped.hpp"
-#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <utility>
 #include <vector>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/package.xml b/localization/deviation_estimation_tools/deviation_estimator/package.xml
index a94028cde..71b50c9ee 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/package.xml
+++ b/localization/deviation_estimation_tools/deviation_estimator/package.xml
@@ -15,6 +15,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <build_depend>autoware_cmake</build_depend>
 
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_universe_utils</depend>
   <depend>autoware_vehicle_msgs</depend>
   <depend>geometry_msgs</depend>
@@ -28,7 +29,6 @@
   <depend>tf2</depend>
   <depend>tf2_geometry_msgs</depend>
   <depend>tf2_ros</depend>
-  <depend>autoware_internal_debug_msgs</depend>
   <exec_depend>rosbag2_storage_mcap</exec_depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
diff --git a/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp b/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
index f0478603b..c0a06a686 100644
--- a/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
+++ b/localization/deviation_estimation_tools/deviation_estimator/src/utils.cpp
@@ -153,7 +153,8 @@ geometry_msgs::msg::Vector3 integrate_orientation(
 /**
  * @brief calculate mean of |vx|
  */
-double get_mean_abs_vx(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list)
+double get_mean_abs_vx(
+  const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list)
 {
   double mean_abs_vx = 0;
   for (const auto & msg : vx_list) {
@@ -179,7 +180,8 @@ double get_mean_abs_wz(const std::vector<geometry_msgs::msg::Vector3Stamped> & g
 /**
  * @brief calculate mean of acceleration
  */
-double get_mean_accel(const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list)
+double get_mean_accel(
+  const std::vector<autoware_internal_debug_msgs::msg::Float64Stamped> & vx_list)
 {
   const double dt =
     (rclcpp::Time(vx_list.back().stamp) - rclcpp::Time(vx_list.front().stamp)).seconds();
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
index 8f57c403d..d2cbffdef 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
+++ b/localization/deviation_estimation_tools/deviation_evaluator/include/deviation_evaluator/deviation_evaluator.hpp
@@ -20,6 +20,7 @@
 #include "rclcpp/rclcpp.hpp"
 #include "tf2/LinearMath/Quaternion.h"
 
+#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 #include "geometry_msgs/msg/pose_stamped.hpp"
 #include "geometry_msgs/msg/pose_with_covariance_stamped.hpp"
 #include "geometry_msgs/msg/twist_with_covariance_stamped.hpp"
@@ -27,7 +28,6 @@
 #include "sensor_msgs/msg/imu.hpp"
 #include "std_msgs/msg/float64.hpp"
 #include "std_srvs/srv/set_bool.hpp"
-#include "autoware_internal_debug_msgs/msg/float64_stamped.hpp"
 
 #include <tf2/utils.h>
 
diff --git a/localization/deviation_estimation_tools/deviation_evaluator/package.xml b/localization/deviation_estimation_tools/deviation_evaluator/package.xml
index 135152023..ca94345ee 100644
--- a/localization/deviation_estimation_tools/deviation_evaluator/package.xml
+++ b/localization/deviation_estimation_tools/deviation_evaluator/package.xml
@@ -15,6 +15,7 @@
   <buildtool_depend>ament_cmake_auto</buildtool_depend>
   <build_depend>autoware_cmake</build_depend>
 
+  <depend>autoware_internal_debug_msgs</depend>
   <depend>autoware_universe_utils</depend>
   <depend>geometry_msgs</depend>
   <depend>nav_msgs</depend>
@@ -25,7 +26,6 @@
   <depend>std_srvs</depend>
   <depend>tf2</depend>
   <depend>tf2_ros</depend>
-  <depend>autoware_internal_debug_msgs</depend>
 
   <test_depend>ament_cmake_gtest</test_depend>
   <test_depend>ament_lint_auto</test_depend>