Skip to content

Commit 3ca9344

Browse files
committed
refactor(planning_data_analyzer): use source-root-relative includes
1 parent f9015c0 commit 3ca9344

28 files changed

Lines changed: 53 additions & 36 deletions

planning/autoware_planning_data_analyzer/CMakeLists.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
2727
src/autoware_planning_data_analyzer_node.cpp
2828
)
2929

30+
target_include_directories(${PROJECT_NAME}
31+
PRIVATE
32+
${CMAKE_CURRENT_SOURCE_DIR}/src
33+
)
34+
3035
rclcpp_components_register_node(${PROJECT_NAME}
3136
PLUGIN "autoware::planning_data_analyzer::AutowarePlanningDataAnalyzerNode"
3237
EXECUTABLE autoware_planning_data_analyzer_node
@@ -48,13 +53,25 @@ if(BUILD_TESTING)
4853
test/metrics/test_no_at_fault_collision.cpp
4954
test/metrics/test_traffic_light_compliance.cpp
5055
)
56+
57+
target_include_directories(test_metrics
58+
PRIVATE
59+
${CMAKE_CURRENT_SOURCE_DIR}/src
60+
)
61+
5162
target_link_libraries(test_metrics ${PROJECT_NAME})
5263

5364
ament_add_gtest(test_offline_evaluation
5465
test/test_bag_handler.cpp
5566
test/test_replay_evaluation.cpp
5667
test/test_open_loop_gt_source_mode.cpp
5768
)
69+
70+
target_include_directories(test_offline_evaluation
71+
PRIVATE
72+
${CMAKE_CURRENT_SOURCE_DIR}/src
73+
)
74+
5875
target_link_libraries(test_offline_evaluation ${PROJECT_NAME})
5976
ament_target_dependencies(test_offline_evaluation autoware_test_utils)
6077
endif()

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/drivable_area_compliance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "drivable_area_compliance.hpp"
1616

17-
#include "../../geometry/metric_utils.hpp"
17+
#include "metrics/geometry/metric_utils.hpp"
1818

1919
#include <autoware_utils_geometry/boost_geometry.hpp>
2020
#include <autoware_utils_geometry/geometry.hpp>

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/ego_progress.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "ego_progress.hpp"
1616

17-
#include "../../geometry/metric_utils.hpp"
17+
#include "metrics/geometry/metric_utils.hpp"
1818

1919
#include <autoware/lanelet2_utils/geometry.hpp>
2020

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/ego_progress.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef METRICS__EPDMS__SUBSCORES__EGO_PROGRESS_HPP_
1616
#define METRICS__EPDMS__SUBSCORES__EGO_PROGRESS_HPP_
1717

18-
#include "../../../data_types.hpp"
18+
#include "data_types.hpp"
1919

2020
#include <autoware/route_handler/route_handler.hpp>
2121

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/extended_comfort.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "extended_comfort.hpp"
1616

17-
#include "../../geometry/metric_utils.hpp"
17+
#include "metrics/geometry/metric_utils.hpp"
1818

1919
#include <autoware_utils_math/normalization.hpp>
2020

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/history_comfort.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "history_comfort.hpp"
1616

17-
#include "../../geometry/metric_utils.hpp"
17+
#include "metrics/geometry/metric_utils.hpp"
1818

1919
#include <autoware_utils_math/normalization.hpp>
2020

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/history_comfort.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef METRICS__EPDMS__SUBSCORES__HISTORY_COMFORT_HPP_
1616
#define METRICS__EPDMS__SUBSCORES__HISTORY_COMFORT_HPP_
1717

18-
#include "../../trajectory_metrics.hpp"
18+
#include "metrics/trajectory_metrics.hpp"
1919

2020
#include <autoware_planning_msgs/msg/trajectory.hpp>
2121

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/no_at_fault_collision.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "no_at_fault_collision.hpp"
1616

17-
#include "../../geometry/metric_utils.hpp"
17+
#include "metrics/geometry/metric_utils.hpp"
1818

1919
#include <autoware/object_recognition_utils/object_classification.hpp>
2020
#include <autoware_utils_geometry/boost_polygon_utils.hpp>

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/no_at_fault_collision.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef METRICS__EPDMS__SUBSCORES__NO_AT_FAULT_COLLISION_HPP_
1616
#define METRICS__EPDMS__SUBSCORES__NO_AT_FAULT_COLLISION_HPP_
1717

18-
#include "../../../data_types.hpp"
18+
#include "data_types.hpp"
1919

2020
#include <autoware/route_handler/route_handler.hpp>
2121
#include <autoware_vehicle_info_utils/vehicle_info.hpp>

planning/autoware_planning_data_analyzer/src/metrics/epdms/subscores/traffic_light_compliance.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "traffic_light_compliance.hpp"
1616

17-
#include "../../geometry/metric_utils.hpp"
17+
#include "metrics/geometry/metric_utils.hpp"
1818

1919
#include <autoware/traffic_light_utils/traffic_light_utils.hpp>
2020
#include <autoware_lanelet2_extension/regulatory_elements/autoware_traffic_light.hpp>

0 commit comments

Comments
 (0)