Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(autoware_tracking_object_merger): move headers to include/autoware and rename package #7809

Merged
merged 2 commits into from
Jul 19, 2024
Merged

refactor(autoware_tracking_object_merger): move headers to include/autoware and rename package #7809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2f5d39
refactor(autoware_tracking_object_merger): move headers to include/au…
esteve Jul 3, 2024
4db3c61
refactor: update package paths in launch files
technolojin Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
control/autoware_pid_longitudinal_controller/** mamoru.sobue@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
control/autoware_pure_pursuit/** takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
control/autoware_shift_decider/** takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
control/autoware_smart_mpc_trajectory_follower/** kosuke.takeuchi@tier4.jp masayuki.aino@proxima-ai-tech.com takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp

Check warning on line 58 in .github/CODEOWNERS

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (masayuki)

Check warning on line 58 in .github/CODEOWNERS

View workflow job for this annotation

GitHub Actions / spell-check-differential 

Unknown word (aino)
control/autoware_trajectory_follower_base/** takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
control/autoware_trajectory_follower_node/** takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
control/autoware_vehicle_cmd_gate/** takamasa.horibe@tier4.jp tomoya.kimura@tier4.jp
Expand Down Expand Up @@ -112,6 +112,7 @@
perception/autoware_radar_fusion_to_detected_object/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
perception/autoware_radar_object_clustering/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
perception/autoware_radar_object_tracker/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_tracking_object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/bytetrack/** manato.hirabayashi@tier4.jp yoshi.ri@tier4.jp
perception/autoware_cluster_merger/** dai.nguyen@tier4.jp shunsuke.miura@tier4.jp yukihiro.saito@tier4.jp
perception/compare_map_segmentation/** abrahammonrroy@yahoo.com dai.nguyen@tier4.jp yukihiro.saito@tier4.jp
Expand All @@ -137,7 +138,6 @@
perception/simple_object_merger/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
perception/tensorrt_classifier/** kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp
perception/tensorrt_yolox/** dan.umeda@tier4.jp manato.hirabayashi@tier4.jp
perception/tracking_object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/traffic_light_arbiter/** kenzo.lobos@tier4.jp shunsuke.miura@tier4.jp
perception/traffic_light_classifier/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp yukihiro.saito@tier4.jp
perception/traffic_light_fine_detector/** shintaro.tomie@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_perception_launch/launch/object_recognition/tracking/tracking.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</include>

<!-- tracking object merger to merge near objects and far objects -->
<include file="$(find-pkg-share tracking_object_merger)/launch/decorative_tracker_merger.launch.xml">
<include file="$(find-pkg-share autoware_tracking_object_merger)/launch/decorative_tracker_merger.launch.xml">
<arg name="input/main_object" value="$(var tracker_merger/input/main_objects)"/>
<arg name="input/sub_object" value="$(var tracker_merger/input/sub_objects)"/>
<arg name="output" value="$(var tracker_merger/output/objects)"/>
Expand Down
3 changes: 2 additions & 1 deletion launch/tier4_perception_launch/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
<exec_depend>autoware_radar_object_clustering</exec_depend>
<exec_depend>autoware_radar_object_tracker</exec_depend>
<exec_depend>autoware_raindrop_cluster_filter</exec_depend>
<exec_depend>autoware_tracking_object_merger</exec_depend>
<exec_depend>cluster_merger</exec_depend>
<exec_depend>compare_map_segmentation</exec_depend>
<exec_depend>detected_object_feature_remover</exec_depend>
<exec_depend>detected_object_validation</exec_depend>
Expand All @@ -41,7 +43,6 @@
<exec_depend>probabilistic_occupancy_grid_map</exec_depend>
<exec_depend>shape_estimation</exec_depend>
<exec_depend>topic_tools</exec_depend>
<exec_depend>tracking_object_merger</exec_depend>
<exec_depend>traffic_light_arbiter</exec_depend>
<exec_depend>traffic_light_classifier</exec_depend>
<exec_depend>traffic_light_fine_detector</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion ...ion/tracking_object_merger/CMakeLists.txt → ...are_tracking_object_merger/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(tracking_object_merger VERSION 1.0.0)
project(autoware_tracking_object_merger VERSION 1.0.0)

if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Wpedantic -Werror -Wconversion)
Expand Down
0 perception/tracking_object_merger/README.md → ...autoware_tracking_object_merger/README.md
View file
Open in desktop
File renamed without changes.
0 ...config/data_association_matrix.param.yaml → ...config/data_association_matrix.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...nfig/decorative_tracker_merger.param.yaml → ...nfig/decorative_tracker_merger.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...corative_tracker_merger_policy.param.yaml → ...corative_tracker_merger_policy.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...mage/decorative_tracker_merger.drawio.svg → ...mage/decorative_tracker_merger.drawio.svg
View file
Open in desktop
File renamed without changes
0 ..._object_merger/image/time_sync.drawio.svg → ..._object_merger/image/time_sync.drawio.svg
View file
Open in desktop
File renamed without changes
0 ...rger/image/tracklet_management.drawio.svg → ...rger/image/tracklet_management.drawio.svg
View file
Open in desktop
File renamed without changes
10 changes: 5 additions & 5 deletions ...t_merger/association/data_association.hpp → ...t_merger/association/data_association.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
// Author: v1.0 Yukihiro Saito
//

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_

#define EIGEN_MPL2_ONLY

#include "autoware_tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
#include "autoware/tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware/tracking_object_merger/utils/tracker_state.hpp"

#include <Eigen/Core>
#include <Eigen/Geometry>
Expand Down Expand Up @@ -72,4 +72,4 @@ class DataAssociation

} // namespace autoware::tracking_object_merger

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
12 changes: 6 additions & 6 deletions ..._merger/association/solver/gnn_solver.hpp → ..._merger/association/solver/gnn_solver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware_tracking_object_merger/association/solver/mu_ssp.hpp"
#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
#include "autoware/tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/tracking_object_merger/association/solver/mu_ssp.hpp"
#include "autoware/tracking_object_merger/association/solver/ssp.hpp"

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
6 changes: 3 additions & 3 deletions ...sociation/solver/gnn_solver_interface.hpp → ...sociation/solver/gnn_solver_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_

#include <unordered_map>
#include <vector>
Expand All @@ -32,4 +32,4 @@ class GnnSolverInterface
};
} // namespace autoware::tracking_object_merger::gnn_solver

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
8 changes: 4 additions & 4 deletions ...ject_merger/association/solver/mu_ssp.hpp → ...ject_merger/association/solver/mu_ssp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_

#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/tracking_object_merger/association/solver/gnn_solver_interface.hpp"

#include <unordered_map>
#include <vector>
Expand All @@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface
};
} // namespace autoware::tracking_object_merger::gnn_solver

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
8 changes: 4 additions & 4 deletions ..._object_merger/association/solver/ssp.hpp → ..._object_merger/association/solver/ssp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_

#include "autoware_tracking_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/tracking_object_merger/association/solver/gnn_solver_interface.hpp"

#include <unordered_map>
#include <vector>
Expand All @@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface
};
} // namespace autoware::tracking_object_merger::gnn_solver

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
12 changes: 6 additions & 6 deletions ...er/src/decorative_tracker_merger_node.hpp → ...merger/decorative_tracker_merger_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef DECORATIVE_TRACKER_MERGER_NODE_HPP_
#define DECORATIVE_TRACKER_MERGER_NODE_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_

#include "autoware/tracking_object_merger/association/data_association.hpp"
#include "autoware/tracking_object_merger/utils/tracker_state.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "autoware/universe_utils/ros/debug_publisher.hpp"
#include "autoware/universe_utils/ros/published_time_publisher.hpp"
#include "autoware/universe_utils/system/stop_watch.hpp"
#include "autoware_tracking_object_merger/association/data_association.hpp"
#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -133,4 +133,4 @@ class DecorativeTrackerMergerNode : public rclcpp::Node

} // namespace autoware::tracking_object_merger

#endif // DECORATIVE_TRACKER_MERGER_NODE_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__DECORATIVE_TRACKER_MERGER_NODE_HPP_
6 changes: 3 additions & 3 deletions ...ing_object_merger/utils/tracker_state.hpp → ...ing_object_merger/utils/tracker_state.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_

#include <Eigen/Core>
#include <Eigen/Geometry>
Expand Down Expand Up @@ -149,4 +149,4 @@ TrackedObjects getTrackedObjectsFromTrackerStates(
std::vector<TrackerState> & tracker_states, const rclcpp::Time & time);
} // namespace autoware::tracking_object_merger

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__TRACKER_STATE_HPP_
6 changes: 3 additions & 3 deletions ...re_tracking_object_merger/utils/utils.hpp → ...re/tracking_object_merger/utils/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
//
//

#ifndef AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#define AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#ifndef AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#define AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_

#include "autoware/universe_utils/geometry/geometry.hpp"

Expand Down Expand Up @@ -100,4 +100,4 @@ void updateWholeTrackedObject(TrackedObject & main_obj, const TrackedObject & su

} // namespace autoware::tracking_object_merger

#endif // AUTOWARE_TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
#endif // AUTOWARE__TRACKING_OBJECT_MERGER__UTILS__UTILS_HPP_
8 changes: 4 additions & 4 deletions ...unch/decorative_tracker_merger.launch.xml → ...unch/decorative_tracker_merger.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<arg name="input/main_object" default="main_object"/>
<arg name="input/sub_object" default="sub_object"/>
<arg name="output" default="merged_object"/>
<arg name="data_association_matrix_path" default="$(find-pkg-share tracking_object_merger)/config/data_association_matrix.param.yaml"/>
<arg name="merge_options_path" default="$(find-pkg-share tracking_object_merger)/config/decorative_tracker_merger_policy.param.yaml"/>
<arg name="node_param_file_path" default="$(find-pkg-share tracking_object_merger)/config/decorative_tracker_merger.param.yaml"/>
<arg name="data_association_matrix_path" default="$(find-pkg-share autoware_tracking_object_merger)/config/data_association_matrix.param.yaml"/>
<arg name="merge_options_path" default="$(find-pkg-share autoware_tracking_object_merger)/config/decorative_tracker_merger_policy.param.yaml"/>
<arg name="node_param_file_path" default="$(find-pkg-share autoware_tracking_object_merger)/config/decorative_tracker_merger.param.yaml"/>

<node pkg="tracking_object_merger" exec="decorative_tracker_merger_node" name="$(anon decorative_tracker_merger)" output="screen">
<node pkg="autoware_tracking_object_merger" exec="decorative_tracker_merger_node" name="$(anon decorative_tracker_merger)" output="screen">
<remap from="input/main_object" to="$(var input/main_object)"/>
<remap from="input/sub_object" to="$(var input/sub_object)"/>
<remap from="output/object" to="$(var output)"/>
Expand Down
2 changes: 1 addition & 1 deletion ...eption/tracking_object_merger/package.xml → ...toware_tracking_object_merger/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>tracking_object_merger</name>
<name>autoware_tracking_object_merger</name>
<version>0.0.0</version>
<description>merge tracking object</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
Expand Down
6 changes: 3 additions & 3 deletions ...rger/src/association/data_association.cpp → ...rger/src/association/data_association.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware_tracking_object_merger/association/data_association.hpp"
#include "autoware/tracking_object_merger/association/data_association.hpp"

#include "autoware/tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "autoware/universe_utils/geometry/geometry.hpp"
#include "autoware_tracking_object_merger/association/solver/gnn_solver.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"

#include <algorithm>
Expand Down
2 changes: 1 addition & 1 deletion ...r/mu_successive_shortest_path_wrapper.cpp → ...r/mu_successive_shortest_path_wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware_tracking_object_merger/association/solver/mu_ssp.hpp"
#include "autoware/tracking_object_merger/association/solver/mu_ssp.hpp"

#include <mussp/mussp.h>

Expand Down
2 changes: 1 addition & 1 deletion ...ation/solver/successive_shortest_path.cpp → ...ation/solver/successive_shortest_path.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
#include "autoware/tracking_object_merger/association/solver/ssp.hpp"

#include <algorithm>
#include <cassert>
Expand Down
6 changes: 3 additions & 3 deletions ...er/src/decorative_tracker_merger_node.cpp → ...er/src/decorative_tracker_merger_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@

#define EIGEN_MPL2_ONLY

#include "decorative_tracker_merger_node.hpp"
#include "autoware/tracking_object_merger/decorative_tracker_merger_node.hpp"

#include "autoware_tracking_object_merger/association/solver/ssp.hpp"
#include "autoware_tracking_object_merger/utils/utils.hpp"
#include "autoware/tracking_object_merger/association/solver/ssp.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"

#include <Eigen/Core>
Expand Down
4 changes: 2 additions & 2 deletions ...object_merger/src/utils/tracker_state.cpp → ...object_merger/src/utils/tracker_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware_tracking_object_merger/utils/tracker_state.hpp"
#include "autoware/tracking_object_merger/utils/tracker_state.hpp"

#include "autoware_tracking_object_merger/utils/utils.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"

namespace autoware::tracking_object_merger
{
Expand Down
2 changes: 1 addition & 1 deletion ...racking_object_merger/src/utils/utils.cpp → ...racking_object_merger/src/utils/utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware_tracking_object_merger/utils/utils.hpp"
#include "autoware/tracking_object_merger/utils/utils.hpp"

#include "autoware_perception_msgs/msg/shape.hpp"
#include "autoware_perception_msgs/msg/tracked_object.hpp"
Expand Down
Loading