Skip to content

Commit b28c98d

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

22 files changed

+20
-17
lines changed

‎.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ map/map_tf_generator/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro
105105
map/util/lanelet2_map_preprocessor/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro.sakamoto@tier4.jp ryu.yamamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
106106
perception/autoware_crosswalk_traffic_light_estimator/** satoshi.ota@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp
107107
perception/autoware_map_based_prediction/** kotaro.uetake@tier4.jp kyoichi.sugahara@tier4.jp takayuki.murooka@tier4.jp tomoya.kimura@tier4.jp yoshi.ri@tier4.jp
108+
perception/autoware_object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
108109
perception/bytetrack/** manato.hirabayashi@tier4.jp yoshi.ri@tier4.jp
109110
perception/cluster_merger/** dai.nguyen@tier4.jp shunsuke.miura@tier4.jp yukihiro.saito@tier4.jp
110111
perception/compare_map_segmentation/** abrahammonrroy@yahoo.com dai.nguyen@tier4.jp yukihiro.saito@tier4.jp
@@ -121,7 +122,6 @@ perception/lidar_apollo_segmentation_tvm_nodes/** ambroise.vincent@arm.com xinyu
121122
perception/lidar_centerpoint/** kenzo.lobos@tier4.jp koji.minoda@tier4.jp
122123
perception/lidar_transfusion/** amadeusz.szymko.2@tier4.jp kenzo.lobos@tier4.jp satoshi.tanaka@tier4.jp
123124
perception/multi_object_tracker/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
124-
perception/object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
125125
perception/object_range_splitter/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
126126
perception/object_velocity_splitter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
127127
perception/occupancy_grid_map_outlier_filter/** abrahammonrroy@yahoo.com yoshi.ri@tier4.jp yukihiro.saito@tier4.jp

‎launch/tier4_perception_launch/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
<exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
1616
<exec_depend>autoware_map_based_prediction</exec_depend>
17+
<exec_depend>autoware_object_merger</exec_depend>
1718
<exec_depend>cluster_merger</exec_depend>
1819
<exec_depend>compare_map_segmentation</exec_depend>
1920
<exec_depend>detected_object_feature_remover</exec_depend>
@@ -26,7 +27,6 @@
2627
<exec_depend>image_transport_decompressor</exec_depend>
2728
<exec_depend>lidar_apollo_instance_segmentation</exec_depend>
2829
<exec_depend>multi_object_tracker</exec_depend>
29-
<exec_depend>object_merger</exec_depend>
3030
<exec_depend>object_range_splitter</exec_depend>
3131
<exec_depend>object_velocity_splitter</exec_depend>
3232
<exec_depend>occupancy_grid_map_outlier_filter</exec_depend>

‎perception/object_merger/CMakeLists.txt ‎perception/autoware_object_merger/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(object_merger)
2+
project(autoware_object_merger)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
@@ -28,6 +28,9 @@ target_link_libraries(${PROJECT_NAME}
2828
Eigen3::Eigen
2929
)
3030

31+
target_include_directories(${PROJECT_NAME}
32+
PRIVATE src)
33+
3134
rclcpp_components_register_node(${PROJECT_NAME}
3235
PLUGIN "autoware::object_merger::ObjectAssociationMergerNode"
3336
EXECUTABLE object_association_merger_node

‎perception/object_merger/README.md ‎perception/autoware_object_merger/README.md

File renamed without changes.

‎perception/object_merger/config/data_association_matrix.param.yaml ‎perception/autoware_object_merger/config/data_association_matrix.param.yaml

File renamed without changes.

‎perception/object_merger/config/object_association_merger.param.yaml ‎perception/autoware_object_merger/config/object_association_merger.param.yaml

File renamed without changes.

‎perception/object_merger/config/overlapped_judge.param.yaml ‎perception/autoware_object_merger/config/overlapped_judge.param.yaml

File renamed without changes.

‎perception/object_merger/launch/object_association_merger.launch.xml ‎perception/autoware_object_merger/launch/object_association_merger.launch.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<arg name="distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
99
<arg name="object_association_merger_param_path" default="$(find-pkg-share object_merger)/config/object_association_merger.param.yaml"/>
1010

11-
<node pkg="object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
11+
<node pkg="autoware_object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
1212
<remap from="input/object0" to="$(var input/object0)"/>
1313
<remap from="input/object1" to="$(var input/object1)"/>
1414
<remap from="output/object" to="$(var output/object)"/>

‎perception/object_merger/package.xml ‎perception/autoware_object_merger/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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>object_merger</name>
4+
<name>autoware_object_merger</name>
55
<version>0.1.0</version>
6-
<description>The object_merger package</description>
6+
<description>The autoware_object_merger package</description>
77
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
88
<maintainer email="yoshi.ri@tier4.jp">Yoshi Ri</maintainer>
99
<maintainer email="taekjin.lee@tier4.jp">Taekjin Lee</maintainer>

‎perception/object_merger/schema/data_association_matrix.schema.json ‎perception/autoware_object_merger/schema/data_association_matrix.schema.json

File renamed without changes.

‎perception/object_merger/schema/object_association_merger.schema.json ‎perception/autoware_object_merger/schema/object_association_merger.schema.json

File renamed without changes.

‎perception/object_merger/schema/overlapped_judge.schema.json ‎perception/autoware_object_merger/schema/overlapped_judge.schema.json

File renamed without changes.

‎perception/object_merger/src/association/data_association.cpp ‎perception/autoware_object_merger/src/association/data_association.cpp

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

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

1717
#include "autoware/universe_utils/geometry/geometry.hpp"
18-
#include "autoware_object_merger/association/solver/gnn_solver.hpp"
18+
#include "association/solver/gnn_solver.hpp"
1919
#include "object_recognition_utils/object_recognition_utils.hpp"
2020

2121
#include <algorithm>

‎perception/object_merger/include/autoware_object_merger/association/data_association.hpp ‎perception/autoware_object_merger/src/association/data_association.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#define EIGEN_MPL2_ONLY
2323

24-
#include "autoware_object_merger/association/solver/gnn_solver.hpp"
24+
#include "association/solver/gnn_solver.hpp"
2525

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

‎perception/object_merger/include/autoware_object_merger/association/solver/gnn_solver.hpp ‎perception/autoware_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_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
1616
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
1717

18-
#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
19-
#include "autoware_object_merger/association/solver/mu_ssp.hpp"
20-
#include "autoware_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_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

‎perception/object_merger/include/autoware_object_merger/association/solver/gnn_solver_interface.hpp ‎perception/autoware_object_merger/src/association/solver/gnn_solver_interface.hpp

File renamed without changes.

‎perception/object_merger/include/autoware_object_merger/association/solver/mu_ssp.hpp ‎perception/autoware_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_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
1616
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
1717

18-
#include "autoware_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/object_merger/src/association/solver/mu_successive_shortest_path_wrapper.cpp ‎perception/autoware_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_object_merger/association/solver/mu_ssp.hpp"
15+
#include "association/solver/mu_ssp.hpp"
1616

1717
#include <mussp/mussp.h>
1818

‎perception/object_merger/include/autoware_object_merger/association/solver/ssp.hpp ‎perception/autoware_object_merger/src/association/solver/ssp.hpp

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

18-
#include "autoware_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/object_merger/src/association/solver/successive_shortest_path.cpp ‎perception/autoware_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_object_merger/association/solver/ssp.hpp"
15+
#include "association/solver/ssp.hpp"
1616

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

‎perception/object_merger/src/object_association_merger_node.cpp ‎perception/autoware_object_merger/src/object_association_merger_node.cpp

File renamed without changes.

‎perception/object_merger/src/object_association_merger_node.hpp ‎perception/autoware_object_merger/src/object_association_merger_node.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
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_object_merger/association/data_association.hpp"
21+
#include "association/data_association.hpp"
2222

2323
#include <rclcpp/rclcpp.hpp>
2424

0 commit comments

Comments
 (0)