Skip to content

Commit 5a9c730

Browse files
esteveesteve
committed
refactor(autoware_tracking_object_merger): move headers to src and rename package
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent a6c709e commit 5a9c730

26 files changed

+29
-25
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ perception/autoware_radar_crossing_objects_noise_filter/** satoshi.tanaka@tier4.
112112
perception/autoware_radar_fusion_to_detected_object/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
113113
perception/autoware_radar_object_clustering/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
114114
perception/autoware_radar_object_tracker/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
115+
perception/autoware_tracking_object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
115116
perception/bytetrack/** manato.hirabayashi@tier4.jp yoshi.ri@tier4.jp
116117
perception/autoware_cluster_merger/** dai.nguyen@tier4.jp shunsuke.miura@tier4.jp yukihiro.saito@tier4.jp
117118
perception/compare_map_segmentation/** abrahammonrroy@yahoo.com dai.nguyen@tier4.jp yukihiro.saito@tier4.jp
@@ -137,7 +138,6 @@ perception/shape_estimation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
137138
perception/simple_object_merger/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
138139
perception/tensorrt_classifier/** kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp
139140
perception/tensorrt_yolox/** dan.umeda@tier4.jp manato.hirabayashi@tier4.jp
140-
perception/tracking_object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
141141
perception/traffic_light_arbiter/** kenzo.lobos@tier4.jp shunsuke.miura@tier4.jp
142142
perception/traffic_light_classifier/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
143143
perception/traffic_light_fine_detector/** shintaro.tomie@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp

‎launch/tier4_perception_launch/package.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<exec_depend>autoware_radar_fusion_to_detected_object</exec_depend>
2323
<exec_depend>autoware_radar_object_clustering</exec_depend>
2424
<exec_depend>autoware_radar_object_tracker</exec_depend>
25+
<exec_depend>autoware_tracking_object_merger</exec_depend>
26+
<exec_depend>cluster_merger</exec_depend>
2527
<exec_depend>compare_map_segmentation</exec_depend>
2628
<exec_depend>detected_object_feature_remover</exec_depend>
2729
<exec_depend>detected_object_validation</exec_depend>
@@ -41,7 +43,6 @@
4143
<exec_depend>raindrop_cluster_filter</exec_depend>
4244
<exec_depend>shape_estimation</exec_depend>
4345
<exec_depend>topic_tools</exec_depend>
44-
<exec_depend>tracking_object_merger</exec_depend>
4546
<exec_depend>traffic_light_arbiter</exec_depend>
4647
<exec_depend>traffic_light_classifier</exec_depend>
4748
<exec_depend>traffic_light_fine_detector</exec_depend>

‎perception/tracking_object_merger/CMakeLists.txt ‎perception/autoware_tracking_object_merger/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.8)
2-
project(tracking_object_merger VERSION 1.0.0)
2+
project(autoware_tracking_object_merger VERSION 1.0.0)
33

44
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
55
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wconversion)
@@ -35,6 +35,9 @@ target_link_libraries(${PROJECT_NAME}
3535
glog::glog
3636
)
3737

38+
target_include_directories(${PROJECT_NAME}
39+
PRIVATE src)
40+
3841
rclcpp_components_register_node(${PROJECT_NAME}
3942
PLUGIN "autoware::tracking_object_merger::DecorativeTrackerMergerNode"
4043
EXECUTABLE decorative_tracker_merger_node

‎perception/tracking_object_merger/README.md ‎perception/autoware_tracking_object_merger/README.md

File renamed without changes.

‎perception/tracking_object_merger/config/data_association_matrix.param.yaml ‎perception/autoware_tracking_object_merger/config/data_association_matrix.param.yaml

File renamed without changes.

‎perception/tracking_object_merger/config/decorative_tracker_merger.param.yaml ‎perception/autoware_tracking_object_merger/config/decorative_tracker_merger.param.yaml

File renamed without changes.

‎perception/tracking_object_merger/config/decorative_tracker_merger_policy.param.yaml ‎perception/autoware_tracking_object_merger/config/decorative_tracker_merger_policy.param.yaml

File renamed without changes.

‎perception/tracking_object_merger/image/decorative_tracker_merger.drawio.svg ‎perception/autoware_tracking_object_merger/image/decorative_tracker_merger.drawio.svg

File renamed without changes.

‎perception/tracking_object_merger/image/time_sync.drawio.svg ‎perception/autoware_tracking_object_merger/image/time_sync.drawio.svg

File renamed without changes.

‎perception/tracking_object_merger/image/tracklet_management.drawio.svg ‎perception/autoware_tracking_object_merger/image/tracklet_management.drawio.svg

File renamed without changes.

‎perception/tracking_object_merger/launch/decorative_tracker_merger.launch.xml ‎perception/autoware_tracking_object_merger/launch/decorative_tracker_merger.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<arg name="merge_options_path" default="$(find-pkg-share tracking_object_merger)/config/decorative_tracker_merger_policy.param.yaml"/>
88
<arg name="node_param_file_path" default="$(find-pkg-share tracking_object_merger)/config/decorative_tracker_merger.param.yaml"/>
99

10-
<node pkg="tracking_object_merger" exec="decorative_tracker_merger_node" name="$(anon decorative_tracker_merger)" output="screen">
10+
<node pkg="autoware_tracking_object_merger" exec="decorative_tracker_merger_node" name="$(anon decorative_tracker_merger)" output="screen">
1111
<remap from="input/main_object" to="$(var input/main_object)"/>
1212
<remap from="input/sub_object" to="$(var input/sub_object)"/>
1313
<remap from="output/object" to="$(var output)"/>

‎perception/tracking_object_merger/package.xml ‎perception/autoware_tracking_object_merger/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>tracking_object_merger</name>
4+
<name>autoware_tracking_object_merger</name>
55
<version>0.0.0</version>
66
<description>merge tracking object</description>
77
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>

‎perception/tracking_object_merger/src/association/data_association.cpp ‎perception/autoware_tracking_object_merger/src/association/data_association.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_tracking_object_merger/association/data_association.hpp"
15+
#include "association/data_association.hpp"
1616

1717
#include "autoware/universe_utils/geometry/geometry.hpp"
18-
#include "autoware_tracking_object_merger/association/solver/gnn_solver.hpp"
19-
#include "autoware_tracking_object_merger/utils/utils.hpp"
18+
#include "association/solver/gnn_solver.hpp"
19+
#include "utils/utils.hpp"
2020
#include "object_recognition_utils/object_recognition_utils.hpp"
2121

2222
#include <algorithm>

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/association/data_association.hpp ‎perception/autoware_tracking_object_merger/src/association/data_association.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
#define EIGEN_MPL2_ONLY
2323

24-
#include "autoware_tracking_object_merger/association/solver/gnn_solver.hpp"
25-
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
24+
#include "association/solver/gnn_solver.hpp"
25+
#include "utils/tracker_state.hpp"
2626

2727
#include <Eigen/Core>
2828
#include <Eigen/Geometry>

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/association/solver/gnn_solver.hpp ‎perception/autoware_tracking_object_merger/src/association/solver/gnn_solver.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
1616
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
1717

18-
#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
19-
#include "autoware_tracking_object_merger/association/solver/mu_ssp.hpp"
20-
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
18+
#include "association/solver/gnn_solver_interface.hpp"
19+
#include "association/solver/mu_ssp.hpp"
20+
#include "association/solver/ssp.hpp"
2121

2222
#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp ‎perception/autoware_tracking_object_merger/src/association/solver/gnn_solver_interface.hpp

File renamed without changes.

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/association/solver/mu_ssp.hpp ‎perception/autoware_tracking_object_merger/src/association/solver/mu_ssp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
1616
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
1717

18-
#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
18+
#include "association/solver/gnn_solver_interface.hpp"
1919

2020
#include <unordered_map>
2121
#include <vector>

‎perception/tracking_object_merger/src/association/solver/mu_successive_shortest_path_wrapper.cpp ‎perception/autoware_tracking_object_merger/src/association/solver/mu_successive_shortest_path_wrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_tracking_object_merger/association/solver/mu_ssp.hpp"
15+
#include "association/solver/mu_ssp.hpp"
1616

1717
#include <mussp/mussp.h>
1818

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/association/solver/ssp.hpp ‎perception/autoware_tracking_object_merger/src/association/solver/ssp.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
1616
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
1717

18-
#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
18+
#include "association/solver/gnn_solver_interface.hpp"
1919

2020
#include <unordered_map>
2121
#include <vector>

‎perception/tracking_object_merger/src/association/solver/successive_shortest_path.cpp ‎perception/autoware_tracking_object_merger/src/association/solver/successive_shortest_path.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
15+
#include "association/solver/ssp.hpp"
1616

1717
#include <algorithm>
1818
#include <cassert>

‎perception/tracking_object_merger/src/decorative_tracker_merger_node.cpp ‎perception/autoware_tracking_object_merger/src/decorative_tracker_merger_node.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
#include "decorative_tracker_merger_node.hpp"
1818

19-
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
20-
#include "autoware_tracking_object_merger/utils/utils.hpp"
19+
#include "association/solver/ssp.hpp"
20+
#include "utils/utils.hpp"
2121
#include "object_recognition_utils/object_recognition_utils.hpp"
2222

2323
#include <Eigen/Core>

‎perception/tracking_object_merger/src/decorative_tracker_merger_node.hpp ‎perception/autoware_tracking_object_merger/src/decorative_tracker_merger_node.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include "autoware/universe_utils/ros/debug_publisher.hpp"
1919
#include "autoware/universe_utils/ros/published_time_publisher.hpp"
2020
#include "autoware/universe_utils/system/stop_watch.hpp"
21-
#include "autoware_tracking_object_merger/association/data_association.hpp"
22-
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
23-
#include "autoware_tracking_object_merger/utils/utils.hpp"
21+
#include "association/data_association.hpp"
22+
#include "utils/tracker_state.hpp"
23+
#include "utils/utils.hpp"
2424

2525
#include <rclcpp/rclcpp.hpp>
2626

‎perception/tracking_object_merger/src/utils/tracker_state.cpp ‎perception/autoware_tracking_object_merger/src/utils/tracker_state.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
15+
#include "utils/tracker_state.hpp"
1616

17-
#include "autoware_tracking_object_merger/utils/utils.hpp"
17+
#include "utils/utils.hpp"
1818

1919
namespace autoware::tracking_object_merger
2020
{

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/utils/tracker_state.hpp ‎perception/autoware_tracking_object_merger/src/utils/tracker_state.hpp

File renamed without changes.

‎perception/tracking_object_merger/src/utils/utils.cpp ‎perception/autoware_tracking_object_merger/src/utils/utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "autoware_tracking_object_merger/utils/utils.hpp"
15+
#include "utils/utils.hpp"
1616

1717
#include "autoware_perception_msgs/msg/shape.hpp"
1818
#include "autoware_perception_msgs/msg/tracked_object.hpp"

‎perception/tracking_object_merger/include/autoware_tracking_object_merger/utils/utils.hpp ‎perception/autoware_tracking_object_merger/src/utils/utils.hpp

File renamed without changes.

0 commit comments

Comments
 (0)