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_object_merger): move headers to src and rename package #7804

Merged
merged 2 commits into from
Jul 19, 2024
Merged

refactor(autoware_object_merger): move headers to src and rename package #7804

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
948b30f
refactor(autoware_object_merger): move headers to src and rename package
esteve Jul 3, 2024
cb97667
refactor(autoware_object_merger): 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
Validating CODEOWNERS rules …
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 @@ -106,6 +106,7 @@
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
perception/autoware_crosswalk_traffic_light_estimator/** satoshi.ota@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp
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
perception/autoware_object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_object_range_splitter/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/autoware_object_velocity_splitter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp
perception/autoware_radar_crossing_objects_noise_filter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
Expand All @@ -128,7 +129,6 @@
perception/lidar_centerpoint/** kenzo.lobos@tier4.jp koji.minoda@tier4.jp
perception/lidar_transfusion/** amadeusz.szymko.2@tier4.jp kenzo.lobos@tier4.jp satoshi.tanaka@tier4.jp
perception/multi_object_tracker/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/object_merger/** taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/occupancy_grid_map_outlier_filter/** abrahammonrroy@yahoo.com yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/probabilistic_occupancy_grid_map/** mamoru.sobue@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
perception/radar_tracks_msgs_converter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
Expand Down
2 changes: 1 addition & 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 @@ -15,6 +15,7 @@

<exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
<exec_depend>autoware_map_based_prediction</exec_depend>
<exec_depend>autoware_object_merger</exec_depend>
<exec_depend>autoware_object_range_splitter</exec_depend>
<exec_depend>autoware_object_velocity_splitter</exec_depend>
<exec_depend>autoware_radar_crossing_objects_noise_filter</exec_depend>
Expand All @@ -33,7 +34,6 @@
<exec_depend>image_transport_decompressor</exec_depend>
<exec_depend>lidar_apollo_instance_segmentation</exec_depend>
<exec_depend>multi_object_tracker</exec_depend>
<exec_depend>object_merger</exec_depend>
<exec_depend>occupancy_grid_map_outlier_filter</exec_depend>
<exec_depend>pointcloud_preprocessor</exec_depend>
<exec_depend>pointcloud_to_laserscan</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion perception/object_merger/CMakeLists.txt → ...ion/autoware_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.14)
project(object_merger)
project(autoware_object_merger)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
0 perception/object_merger/README.md → perception/autoware_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/object_association_merger.param.yaml → ...nfig/object_association_merger.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...merger/config/overlapped_judge.param.yaml → ...merger/config/overlapped_judge.param.yaml
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 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,12 +16,12 @@
// Author: v1.0 Yukihiro Saito
//

#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_

#define EIGEN_MPL2_ONLY

#include "autoware_object_merger/association/solver/gnn_solver.hpp"
#include "autoware/object_merger/association/solver/gnn_solver.hpp"

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

} // namespace autoware::object_merger

#endif // AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
#endif // AUTOWARE__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_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_

#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware_object_merger/association/solver/mu_ssp.hpp"
#include "autoware_object_merger/association/solver/ssp.hpp"
#include "autoware/object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/object_merger/association/solver/mu_ssp.hpp"
#include "autoware/object_merger/association/solver/ssp.hpp"

#endif // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
#endif // AUTOWARE__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_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_

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

#endif // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
#endif // AUTOWARE__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_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_

#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/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::object_merger::gnn_solver

#endif // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
#endif // AUTOWARE__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_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_

#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
#include "autoware/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::object_merger::gnn_solver

#endif // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
#endif // AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
8 changes: 4 additions & 4 deletions ...er/src/object_association_merger_node.hpp → ...merger/object_association_merger_node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef OBJECT_ASSOCIATION_MERGER_NODE_HPP_
#define OBJECT_ASSOCIATION_MERGER_NODE_HPP_
#ifndef AUTOWARE__OBJECT_MERGER__OBJECT_ASSOCIATION_MERGER_NODE_HPP_
#define AUTOWARE__OBJECT_MERGER__OBJECT_ASSOCIATION_MERGER_NODE_HPP_

#include "autoware/object_merger/association/data_association.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_object_merger/association/data_association.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -91,4 +91,4 @@ class ObjectAssociationMergerNode : public rclcpp::Node
};
} // namespace autoware::object_merger

#endif // OBJECT_ASSOCIATION_MERGER_NODE_HPP_
#endif // AUTOWARE__OBJECT_MERGER__OBJECT_ASSOCIATION_MERGER_NODE_HPP_
2 changes: 1 addition & 1 deletion ...unch/object_association_merger.launch.xml → ...unch/object_association_merger.launch.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<arg name="distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
technolojin marked this conversation as resolved.
Show resolved Hide resolved
<arg name="object_association_merger_param_path" default="$(find-pkg-share object_merger)/config/object_association_merger.param.yaml"/>

<node pkg="object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
<node pkg="autoware_object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
<remap from="input/object0" to="$(var input/object0)"/>
<remap from="input/object1" to="$(var input/object1)"/>
<remap from="output/object" to="$(var output/object)"/>
Expand Down
4 changes: 2 additions & 2 deletions perception/object_merger/package.xml → ...eption/autoware_object_merger/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?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>object_merger</name>
<name>autoware_object_merger</name>
<version>0.1.0</version>
<description>The object_merger package</description>
<description>The autoware_object_merger package</description>
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
<maintainer email="yoshi.ri@tier4.jp">Yoshi Ri</maintainer>
<maintainer email="taekjin.lee@tier4.jp">Taekjin Lee</maintainer>
Expand Down
0 ...chema/data_association_matrix.schema.json → ...chema/data_association_matrix.schema.json
View file
Open in desktop
File renamed without changes.
0 ...ema/object_association_merger.schema.json → ...ema/object_association_merger.schema.json
View file
Open in desktop
File renamed without changes.
0 ...erger/schema/overlapped_judge.schema.json → ...erger/schema/overlapped_judge.schema.json
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 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,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "autoware_object_merger/association/data_association.hpp"
#include "autoware/object_merger/association/data_association.hpp"

#include "autoware/object_merger/association/solver/gnn_solver.hpp"
#include "autoware/universe_utils/geometry/geometry.hpp"
#include "autoware_object_merger/association/solver/gnn_solver.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_object_merger/association/solver/mu_ssp.hpp"
#include "autoware/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_object_merger/association/solver/ssp.hpp"
#include "autoware/object_merger/association/solver/ssp.hpp"

#include <algorithm>
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/object_association_merger_node.cpp → ...er/src/object_association_merger_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#define EIGEN_MPL2_ONLY

#include "object_association_merger_node.hpp"
#include "autoware/object_merger/object_association_merger_node.hpp"

#include "autoware/universe_utils/geometry/geometry.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"
Expand Down
Loading