chore(build): remove tier4_autoware_utils.hpp evaluator/ simulator/ (autowarefoundation#4839)

soblin · web-flow · commit 887722ccb7aa · 2023-09-02T17:41:52.000+09:00
Signed-off-by: Mamoru Sobue &lt;mamoru.sobue@tier4.jp&gt;
diff --git a/evaluator/kinematic_evaluator/src/metrics/kinematic_metrics.cpp b/evaluator/kinematic_evaluator/src/metrics/kinematic_metrics.cpp
@@ -14,8 +14,6 @@
 
 #include "kinematic_evaluator/metrics/kinematic_metrics.hpp"
 
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
-
 namespace kinematic_diagnostics
 {
 namespace metrics
diff --git a/evaluator/localization_evaluator/src/metrics/localization_metrics.cpp b/evaluator/localization_evaluator/src/metrics/localization_metrics.cpp
@@ -14,7 +14,7 @@
 
 #include "localization_evaluator/metrics/localization_metrics.hpp"
 
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
+#include <cmath>
 
 namespace localization_diagnostics
 {
diff --git a/evaluator/planning_evaluator/src/metrics/deviation_metrics.cpp b/evaluator/planning_evaluator/src/metrics/deviation_metrics.cpp
@@ -15,7 +15,8 @@
 #include "planning_evaluator/metrics/deviation_metrics.hpp"
 
 #include "motion_utils/trajectory/trajectory.hpp"
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
+#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "tier4_autoware_utils/geometry/pose_deviation.hpp"
 
 namespace planning_diagnostics
 {
diff --git a/evaluator/planning_evaluator/src/metrics/metrics_utils.cpp b/evaluator/planning_evaluator/src/metrics/metrics_utils.cpp
@@ -13,8 +13,7 @@
 // limitations under the License.
 
 #include "planning_evaluator/metrics/trajectory_metrics.hpp"
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
-
+#include "tier4_autoware_utils/geometry/geometry.hpp"
 namespace planning_diagnostics
 {
 namespace metrics
diff --git a/evaluator/planning_evaluator/src/metrics/obstacle_metrics.cpp b/evaluator/planning_evaluator/src/metrics/obstacle_metrics.cpp
@@ -14,7 +14,7 @@
 
 #include "planning_evaluator/metrics/obstacle_metrics.hpp"
 
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
+#include "tier4_autoware_utils/geometry/geometry.hpp"
 
 #include <Eigen/Core>
 
diff --git a/evaluator/planning_evaluator/src/metrics/stability_metrics.cpp b/evaluator/planning_evaluator/src/metrics/stability_metrics.cpp
@@ -15,7 +15,7 @@
 #include "planning_evaluator/metrics/stability_metrics.hpp"
 
 #include "motion_utils/trajectory/trajectory.hpp"
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
+#include "tier4_autoware_utils/geometry/geometry.hpp"
 
 #include <Eigen/Core>
 
diff --git a/evaluator/planning_evaluator/src/metrics/trajectory_metrics.cpp b/evaluator/planning_evaluator/src/metrics/trajectory_metrics.cpp
@@ -15,8 +15,7 @@
 #include "planning_evaluator/metrics/trajectory_metrics.hpp"
 
 #include "planning_evaluator/metrics/metrics_utils.hpp"
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
-
+#include "tier4_autoware_utils/geometry/geometry.hpp"
 namespace planning_diagnostics
 {
 namespace metrics
diff --git a/evaluator/planning_evaluator/src/metrics_calculator.cpp b/evaluator/planning_evaluator/src/metrics_calculator.cpp
@@ -14,13 +14,12 @@
 
 #include "planning_evaluator/metrics_calculator.hpp"
 
-#include "motion_utils/motion_utils.hpp"
+#include "motion_utils/trajectory/trajectory.hpp"
 #include "planning_evaluator/metrics/deviation_metrics.hpp"
 #include "planning_evaluator/metrics/obstacle_metrics.hpp"
 #include "planning_evaluator/metrics/stability_metrics.hpp"
 #include "planning_evaluator/metrics/trajectory_metrics.hpp"
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
-
+#include "tier4_autoware_utils/geometry/geometry.hpp"
 namespace planning_diagnostics
 {
 std::optional<Stat<double>> MetricsCalculator::calculate(
diff --git a/simulator/dummy_perception_publisher/src/node.cpp b/simulator/dummy_perception_publisher/src/node.cpp
@@ -14,7 +14,7 @@
 
 #include "dummy_perception_publisher/node.hpp"
 
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
+#include "tier4_autoware_utils/geometry/geometry.hpp"
 
 #include <pcl/filters/voxel_grid_occlusion_estimation.h>
 #include <tf2/LinearMath/Quaternion.h>
diff --git a/simulator/simple_planning_simulator/src/simple_planning_simulator/simple_planning_simulator_core.cpp b/simulator/simple_planning_simulator/src/simple_planning_simulator/simple_planning_simulator_core.cpp
@@ -17,7 +17,9 @@
 #include "autoware_auto_tf2/tf2_autoware_auto_msgs.hpp"
 #include "rclcpp_components/register_node_macro.hpp"
 #include "simple_planning_simulator/vehicle_model/sim_model.hpp"
-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"
+#include "tier4_autoware_utils/geometry/geometry.hpp"
+#include "tier4_autoware_utils/ros/msg_covariance.hpp"
+#include "tier4_autoware_utils/ros/update_param.hpp"
 #include "vehicle_info_util/vehicle_info_util.hpp"
 
 #include <tf2/LinearMath/Quaternion.h>

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@`
`14`	`14`
`15`	`15`	`#include "kinematic_evaluator/metrics/kinematic_metrics.hpp"`
`16`	`16`
`17`		`-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"`
`18`		`-`
`19`	`17`	`namespace kinematic_diagnostics`
`20`	`18`	`{`
`21`	`19`	`namespace metrics`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`#include "localization_evaluator/metrics/localization_metrics.hpp"`
`16`	`16`
`17`		`-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"`
	`17`	`+#include <cmath>`
`18`	`18`
`19`	`19`	`namespace localization_diagnostics`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@`
`15`	`15`	`#include "planning_evaluator/metrics/deviation_metrics.hpp"`
`16`	`16`
`17`	`17`	`#include "motion_utils/trajectory/trajectory.hpp"`
`18`		`-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"`
	`18`	`+#include "tier4_autoware_utils/geometry/geometry.hpp"`
	`19`	`+#include "tier4_autoware_utils/geometry/pose_deviation.hpp"`
`19`	`20`
`20`	`21`	`namespace planning_diagnostics`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,7 @@`
`13`	`13`	`// limitations under the License.`
`14`	`14`
`15`	`15`	`#include "planning_evaluator/metrics/trajectory_metrics.hpp"`
`16`		`-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"`
`17`		`-`
	`16`	`+#include "tier4_autoware_utils/geometry/geometry.hpp"`
`18`	`17`	`namespace planning_diagnostics`
`19`	`18`	`{`
`20`	`19`	`namespace metrics`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`#include "planning_evaluator/metrics/trajectory_metrics.hpp"`
`16`	`16`
`17`	`17`	`#include "planning_evaluator/metrics/metrics_utils.hpp"`
`18`		`-#include "tier4_autoware_utils/tier4_autoware_utils.hpp"`
`19`		`-`
	`18`	`+#include "tier4_autoware_utils/geometry/geometry.hpp"`
`20`	`19`	`namespace planning_diagnostics`
`21`	`20`	`{`
`22`	`21`	`namespace metrics`