diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b932cc62b77ca..111d73f583b01 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -105,6 +105,7 @@ map/map_tf_generator/** anh.nguyen.2@tier4.jp kento.yabuuchi.2@tier4.jp masahiro 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_radar_object_tracker/** satoshi.tanaka@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp perception/bytetrack/** manato.hirabayashi@tier4.jp yoshi.ri@tier4.jp perception/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 @@ -129,7 +130,6 @@ perception/probabilistic_occupancy_grid_map/** mamoru.sobue@tier4.jp yoshi.ri@ti perception/radar_crossing_objects_noise_filter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp perception/radar_fusion_to_detected_object/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp perception/radar_object_clustering/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp -perception/radar_object_tracker/** satoshi.tanaka@tier4.jp taekjin.lee@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 perception/raindrop_cluster_filter/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp perception/shape_estimation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml index 57d4b209efeef..5bc44c0de7621 100644 --- a/launch/tier4_perception_launch/package.xml +++ b/launch/tier4_perception_launch/package.xml @@ -14,6 +14,8 @@ autoware_crosswalk_traffic_light_estimator autoware_map_based_prediction + autoware_radar_object_clustering + autoware_radar_object_tracker cluster_merger compare_map_segmentation detected_object_feature_remover @@ -35,8 +37,6 @@ probabilistic_occupancy_grid_map radar_crossing_objects_noise_filter radar_fusion_to_detected_object - radar_object_clustering - radar_object_tracker shape_estimation topic_tools tracking_object_merger diff --git a/perception/radar_object_tracker/CMakeLists.txt b/perception/autoware_radar_object_tracker/CMakeLists.txt similarity index 94% rename from perception/radar_object_tracker/CMakeLists.txt rename to perception/autoware_radar_object_tracker/CMakeLists.txt index b732ef6cc863c..d5707c10f25b0 100644 --- a/perception/radar_object_tracker/CMakeLists.txt +++ b/perception/autoware_radar_object_tracker/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.8) -project(radar_object_tracker) +project(autoware_radar_object_tracker) find_package(autoware_cmake REQUIRED) autoware_package() @@ -42,6 +42,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_utils ) +target_include_directories(${PROJECT_NAME} + PRIVATE src) + rclcpp_components_register_node(${PROJECT_NAME} PLUGIN "autoware::radar_object_tracker::RadarObjectTrackerNode" EXECUTABLE radar_object_tracker_node diff --git a/perception/radar_object_tracker/README.md b/perception/autoware_radar_object_tracker/README.md similarity index 100% rename from perception/radar_object_tracker/README.md rename to perception/autoware_radar_object_tracker/README.md diff --git a/perception/radar_object_tracker/config/data_association_matrix.param.yaml b/perception/autoware_radar_object_tracker/config/data_association_matrix.param.yaml similarity index 100% rename from perception/radar_object_tracker/config/data_association_matrix.param.yaml rename to perception/autoware_radar_object_tracker/config/data_association_matrix.param.yaml diff --git a/perception/radar_object_tracker/config/default_tracker.param.yaml b/perception/autoware_radar_object_tracker/config/default_tracker.param.yaml similarity index 100% rename from perception/radar_object_tracker/config/default_tracker.param.yaml rename to perception/autoware_radar_object_tracker/config/default_tracker.param.yaml diff --git a/perception/radar_object_tracker/config/radar_object_tracker.param.yaml b/perception/autoware_radar_object_tracker/config/radar_object_tracker.param.yaml similarity index 100% rename from perception/radar_object_tracker/config/radar_object_tracker.param.yaml rename to perception/autoware_radar_object_tracker/config/radar_object_tracker.param.yaml diff --git a/perception/radar_object_tracker/config/simulation_tracker.param.yaml b/perception/autoware_radar_object_tracker/config/simulation_tracker.param.yaml similarity index 100% rename from perception/radar_object_tracker/config/simulation_tracker.param.yaml rename to perception/autoware_radar_object_tracker/config/simulation_tracker.param.yaml diff --git a/perception/radar_object_tracker/config/tracking/constant_turn_rate_motion_tracker.yaml b/perception/autoware_radar_object_tracker/config/tracking/constant_turn_rate_motion_tracker.yaml similarity index 100% rename from perception/radar_object_tracker/config/tracking/constant_turn_rate_motion_tracker.yaml rename to perception/autoware_radar_object_tracker/config/tracking/constant_turn_rate_motion_tracker.yaml diff --git a/perception/radar_object_tracker/config/tracking/linear_motion_tracker.yaml b/perception/autoware_radar_object_tracker/config/tracking/linear_motion_tracker.yaml similarity index 100% rename from perception/radar_object_tracker/config/tracking/linear_motion_tracker.yaml rename to perception/autoware_radar_object_tracker/config/tracking/linear_motion_tracker.yaml diff --git a/perception/radar_object_tracker/image/noise_filtering.drawio.svg b/perception/autoware_radar_object_tracker/image/noise_filtering.drawio.svg similarity index 100% rename from perception/radar_object_tracker/image/noise_filtering.drawio.svg rename to perception/autoware_radar_object_tracker/image/noise_filtering.drawio.svg diff --git a/perception/radar_object_tracker/launch/radar_object_tracker.launch.xml b/perception/autoware_radar_object_tracker/launch/radar_object_tracker.launch.xml similarity index 88% rename from perception/radar_object_tracker/launch/radar_object_tracker.launch.xml rename to perception/autoware_radar_object_tracker/launch/radar_object_tracker.launch.xml index 313ef4b0f9fcd..dca76146680ee 100644 --- a/perception/radar_object_tracker/launch/radar_object_tracker.launch.xml +++ b/perception/autoware_radar_object_tracker/launch/radar_object_tracker.launch.xml @@ -7,7 +7,7 @@ - + diff --git a/perception/radar_object_tracker/models.md b/perception/autoware_radar_object_tracker/models.md similarity index 100% rename from perception/radar_object_tracker/models.md rename to perception/autoware_radar_object_tracker/models.md diff --git a/perception/radar_object_tracker/package.xml b/perception/autoware_radar_object_tracker/package.xml similarity index 96% rename from perception/radar_object_tracker/package.xml rename to perception/autoware_radar_object_tracker/package.xml index 79ae0385d4b5e..34379e8c7d59c 100644 --- a/perception/radar_object_tracker/package.xml +++ b/perception/autoware_radar_object_tracker/package.xml @@ -1,7 +1,7 @@ - radar_object_tracker + autoware_radar_object_tracker 0.0.0 Do tracking radar object Yoshi Ri diff --git a/perception/radar_object_tracker/src/association/data_association.cpp b/perception/autoware_radar_object_tracker/src/association/data_association.cpp similarity index 100% rename from perception/radar_object_tracker/src/association/data_association.cpp rename to perception/autoware_radar_object_tracker/src/association/data_association.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/data_association.hpp b/perception/autoware_radar_object_tracker/src/association/data_association.hpp similarity index 90% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/association/data_association.hpp rename to perception/autoware_radar_object_tracker/src/association/data_association.hpp index efde1e6763cdd..c954db1af510d 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/data_association.hpp +++ b/perception/autoware_radar_object_tracker/src/association/data_association.hpp @@ -16,8 +16,8 @@ // Author: v1.0 Yukihiro Saito // -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__DATA_ASSOCIATION_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__DATA_ASSOCIATION_HPP_ +#ifndef ASSOCIATION__DATA_ASSOCIATION_HPP_ +#define ASSOCIATION__DATA_ASSOCIATION_HPP_ #define EIGEN_MPL2_ONLY @@ -65,4 +65,4 @@ class DataAssociation virtual ~DataAssociation() {} }; } // namespace autoware::radar_object_tracker -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__DATA_ASSOCIATION_HPP_ +#endif // ASSOCIATION__DATA_ASSOCIATION_HPP_ diff --git a/perception/radar_object_tracker/src/association/mu_ssp/mu_successive_shortest_path_wrapper.cpp b/perception/autoware_radar_object_tracker/src/association/mu_ssp/mu_successive_shortest_path_wrapper.cpp similarity index 100% rename from perception/radar_object_tracker/src/association/mu_ssp/mu_successive_shortest_path_wrapper.cpp rename to perception/autoware_radar_object_tracker/src/association/mu_ssp/mu_successive_shortest_path_wrapper.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/gnn_solver.hpp b/perception/autoware_radar_object_tracker/src/association/solver/gnn_solver.hpp similarity index 77% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/gnn_solver.hpp rename to perception/autoware_radar_object_tracker/src/association/solver/gnn_solver.hpp index 2aa4a577ef91c..dd19e068d1031 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/gnn_solver.hpp +++ b/perception/autoware_radar_object_tracker/src/association/solver/gnn_solver.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_ +#ifndef ASSOCIATION__SOLVER__GNN_SOLVER_HPP_ +#define ASSOCIATION__SOLVER__GNN_SOLVER_HPP_ #include "autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp" #include "autoware_radar_object_tracker/association/solver/mu_ssp.hpp" #include "autoware_radar_object_tracker/association/solver/ssp.hpp" -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_ +#endif // ASSOCIATION__SOLVER__GNN_SOLVER_HPP_ diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp b/perception/autoware_radar_object_tracker/src/association/solver/gnn_solver_interface.hpp similarity index 80% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp rename to perception/autoware_radar_object_tracker/src/association/solver/gnn_solver_interface.hpp index ee2e98ba47278..311ab94363371 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp +++ b/perception/autoware_radar_object_tracker/src/association/solver/gnn_solver_interface.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_ +#ifndef ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_ +#define ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_ #include #include @@ -32,4 +32,4 @@ class GnnSolverInterface }; } // namespace autoware::radar_object_tracker::gnn_solver -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_ +#endif // ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_ diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/mu_ssp.hpp b/perception/autoware_radar_object_tracker/src/association/solver/mu_ssp.hpp similarity index 83% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/mu_ssp.hpp rename to perception/autoware_radar_object_tracker/src/association/solver/mu_ssp.hpp index 2a5a336a3eb87..cbc679c1f06f1 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/mu_ssp.hpp +++ b/perception/autoware_radar_object_tracker/src/association/solver/mu_ssp.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_ +#ifndef ASSOCIATION__SOLVER__MU_SSP_HPP_ +#define ASSOCIATION__SOLVER__MU_SSP_HPP_ #include "autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp" @@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface }; } // namespace autoware::radar_object_tracker::gnn_solver -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__MU_SSP_HPP_ +#endif // ASSOCIATION__SOLVER__MU_SSP_HPP_ diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/ssp.hpp b/perception/autoware_radar_object_tracker/src/association/solver/ssp.hpp similarity index 84% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/ssp.hpp rename to perception/autoware_radar_object_tracker/src/association/solver/ssp.hpp index c956e1ebd2f6d..6c09982015f72 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/association/solver/ssp.hpp +++ b/perception/autoware_radar_object_tracker/src/association/solver/ssp.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_ +#ifndef ASSOCIATION__SOLVER__SSP_HPP_ +#define ASSOCIATION__SOLVER__SSP_HPP_ #include "autoware_radar_object_tracker/association/solver/gnn_solver_interface.hpp" @@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface }; } // namespace autoware::radar_object_tracker::gnn_solver -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__ASSOCIATION__SOLVER__SSP_HPP_ +#endif // ASSOCIATION__SOLVER__SSP_HPP_ diff --git a/perception/radar_object_tracker/src/association/ssp/successive_shortest_path.cpp b/perception/autoware_radar_object_tracker/src/association/ssp/successive_shortest_path.cpp similarity index 100% rename from perception/radar_object_tracker/src/association/ssp/successive_shortest_path.cpp rename to perception/autoware_radar_object_tracker/src/association/ssp/successive_shortest_path.cpp diff --git a/perception/radar_object_tracker/src/radar_object_tracker_node.cpp b/perception/autoware_radar_object_tracker/src/radar_object_tracker_node.cpp similarity index 100% rename from perception/radar_object_tracker/src/radar_object_tracker_node.cpp rename to perception/autoware_radar_object_tracker/src/radar_object_tracker_node.cpp diff --git a/perception/radar_object_tracker/src/radar_object_tracker_node.hpp b/perception/autoware_radar_object_tracker/src/radar_object_tracker_node.hpp similarity index 100% rename from perception/radar_object_tracker/src/radar_object_tracker_node.hpp rename to perception/autoware_radar_object_tracker/src/radar_object_tracker_node.hpp diff --git a/perception/radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.cpp b/perception/autoware_radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.cpp similarity index 100% rename from perception/radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.cpp rename to perception/autoware_radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/constant_turn_rate_motion_tracker.hpp b/perception/autoware_radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.hpp similarity index 92% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/constant_turn_rate_motion_tracker.hpp rename to perception/autoware_radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.hpp index dab4d3f8efa24..c9cde51a89d8c 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/constant_turn_rate_motion_tracker.hpp +++ b/perception/autoware_radar_object_tracker/src/tracker/model/constant_turn_rate_motion_tracker.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_ +#ifndef TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_ +#define TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_ #include "autoware_radar_object_tracker/tracker/model/tracker_base.hpp" #include "kalman_filter/kalman_filter.hpp" @@ -109,4 +109,4 @@ class ConstantTurnRateMotionTracker : public Tracker // means constant turn rat virtual ~ConstantTurnRateMotionTracker() {} }; } // namespace autoware::radar_object_tracker -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_ +#endif // TRACKER__MODEL__CONSTANT_TURN_RATE_MOTION_TRACKER_HPP_ diff --git a/perception/radar_object_tracker/src/tracker/model/linear_motion_tracker.cpp b/perception/autoware_radar_object_tracker/src/tracker/model/linear_motion_tracker.cpp similarity index 100% rename from perception/radar_object_tracker/src/tracker/model/linear_motion_tracker.cpp rename to perception/autoware_radar_object_tracker/src/tracker/model/linear_motion_tracker.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/linear_motion_tracker.hpp b/perception/autoware_radar_object_tracker/src/tracker/model/linear_motion_tracker.hpp similarity index 93% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/linear_motion_tracker.hpp rename to perception/autoware_radar_object_tracker/src/tracker/model/linear_motion_tracker.hpp index 7c96aa8fbaa36..522d76ead4317 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/linear_motion_tracker.hpp +++ b/perception/autoware_radar_object_tracker/src/tracker/model/linear_motion_tracker.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_ +#ifndef TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_ +#define TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_ #include "autoware_radar_object_tracker/tracker/model/tracker_base.hpp" #include "kalman_filter/kalman_filter.hpp" @@ -114,4 +114,4 @@ class LinearMotionTracker : public Tracker virtual ~LinearMotionTracker() {} }; } // namespace autoware::radar_object_tracker -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_ +#endif // TRACKER__MODEL__LINEAR_MOTION_TRACKER_HPP_ diff --git a/perception/radar_object_tracker/src/tracker/model/tracker_base.cpp b/perception/autoware_radar_object_tracker/src/tracker/model/tracker_base.cpp similarity index 100% rename from perception/radar_object_tracker/src/tracker/model/tracker_base.cpp rename to perception/autoware_radar_object_tracker/src/tracker/model/tracker_base.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/tracker_base.hpp b/perception/autoware_radar_object_tracker/src/tracker/model/tracker_base.hpp similarity index 93% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/tracker_base.hpp rename to perception/autoware_radar_object_tracker/src/tracker/model/tracker_base.hpp index caea725ef8f81..8d6904cdf29a5 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/model/tracker_base.hpp +++ b/perception/autoware_radar_object_tracker/src/tracker/model/tracker_base.hpp @@ -16,8 +16,8 @@ // Author: v1.0 Yukihiro Saito // -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_ +#ifndef TRACKER__MODEL__TRACKER_BASE_HPP_ +#define TRACKER__MODEL__TRACKER_BASE_HPP_ #define EIGEN_MPL2_ONLY #include "autoware_radar_object_tracker/utils/utils.hpp" @@ -95,4 +95,4 @@ class Tracker virtual bool predict(const rclcpp::Time & time) = 0; }; } // namespace autoware::radar_object_tracker -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__MODEL__TRACKER_BASE_HPP_ +#endif // TRACKER__MODEL__TRACKER_BASE_HPP_ diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/tracker.hpp b/perception/autoware_radar_object_tracker/src/tracker/tracker.hpp similarity index 79% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/tracker.hpp rename to perception/autoware_radar_object_tracker/src/tracker/tracker.hpp index 26222f4c65679..a8a1861e0e8ef 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/tracker/tracker.hpp +++ b/perception/autoware_radar_object_tracker/src/tracker/tracker.hpp @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__TRACKER_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__TRACKER_HPP_ +#ifndef TRACKER__TRACKER_HPP_ +#define TRACKER__TRACKER_HPP_ #include "model/constant_turn_rate_motion_tracker.hpp" #include "model/linear_motion_tracker.hpp" #include "model/tracker_base.hpp" -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__TRACKER__TRACKER_HPP_ +#endif // TRACKER__TRACKER_HPP_ diff --git a/perception/radar_object_tracker/src/utils/radar_object_tracker_utils.cpp b/perception/autoware_radar_object_tracker/src/utils/radar_object_tracker_utils.cpp similarity index 100% rename from perception/radar_object_tracker/src/utils/radar_object_tracker_utils.cpp rename to perception/autoware_radar_object_tracker/src/utils/radar_object_tracker_utils.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/utils/radar_object_tracker_utils.hpp b/perception/autoware_radar_object_tracker/src/utils/radar_object_tracker_utils.hpp similarity index 91% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/utils/radar_object_tracker_utils.hpp rename to perception/autoware_radar_object_tracker/src/utils/radar_object_tracker_utils.hpp index f4fb977d65de2..473e2ad32f6a8 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/utils/radar_object_tracker_utils.hpp +++ b/perception/autoware_radar_object_tracker/src/utils/radar_object_tracker_utils.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_ +#ifndef UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_ +#define UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_ #include "autoware/universe_utils/geometry/geometry.hpp" #include "autoware/universe_utils/math/unit_conversion.hpp" @@ -73,4 +73,4 @@ bool hasValidVelocityDirectionToLanelet( } // namespace autoware::radar_object_tracker::utils -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_ +#endif // UTILS__RADAR_OBJECT_TRACKER_UTILS_HPP_ diff --git a/perception/radar_object_tracker/src/utils/utils.cpp b/perception/autoware_radar_object_tracker/src/utils/utils.cpp similarity index 100% rename from perception/radar_object_tracker/src/utils/utils.cpp rename to perception/autoware_radar_object_tracker/src/utils/utils.cpp diff --git a/perception/radar_object_tracker/include/autoware_radar_object_tracker/utils/utils.hpp b/perception/autoware_radar_object_tracker/src/utils/utils.hpp similarity index 88% rename from perception/radar_object_tracker/include/autoware_radar_object_tracker/utils/utils.hpp rename to perception/autoware_radar_object_tracker/src/utils/utils.hpp index dd011ac274b64..60caa7db1b353 100644 --- a/perception/radar_object_tracker/include/autoware_radar_object_tracker/utils/utils.hpp +++ b/perception/autoware_radar_object_tracker/src/utils/utils.hpp @@ -16,8 +16,8 @@ // Author: v1.0 Yukihiro Saito // -#ifndef AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__UTILS_HPP_ -#define AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__UTILS_HPP_ +#ifndef UTILS__UTILS_HPP_ +#define UTILS__UTILS_HPP_ #include #include @@ -41,4 +41,4 @@ Eigen::MatrixXd stackMatricesDiagonally(const std::vector & mat } // namespace autoware::radar_object_tracker::utils -#endif // AUTOWARE_RADAR_OBJECT_TRACKER__UTILS__UTILS_HPP_ +#endif // UTILS__UTILS_HPP_ diff --git a/perception/radar_object_tracker/test/test_radar_object_tracker_utils.cpp b/perception/autoware_radar_object_tracker/test/test_radar_object_tracker_utils.cpp similarity index 100% rename from perception/radar_object_tracker/test/test_radar_object_tracker_utils.cpp rename to perception/autoware_radar_object_tracker/test/test_radar_object_tracker_utils.cpp diff --git a/perception/radar_object_clustering/package.xml b/perception/radar_object_clustering/package.xml index c7666d2c5701e..d9c3464e02b18 100644 --- a/perception/radar_object_clustering/package.xml +++ b/perception/radar_object_clustering/package.xml @@ -1,9 +1,9 @@ - radar_object_clustering + autoware_radar_object_clustering 0.1.0 - radar_object_clustering + autoware_radar_object_clustering Sathshi Tanaka Shunsuke Miura Yoshi Ri