From 0db8f67b4332626e35169339b68fe57a71f62648 Mon Sep 17 00:00:00 2001 From: Taekjin LEE Date: Wed, 10 Jul 2024 14:49:08 +0900 Subject: [PATCH] refactor(radar_tracks_noise_filter)!: fix namespace and directory structure (#7911) feat(radar_tracks_noise_filter): fix namespace and directory structure Signed-off-by: Taekjin LEE --- sensing/radar_tracks_noise_filter/CMakeLists.txt | 14 +++++++------- .../radar_tracks_noise_filter_node.cpp | 9 +++++---- .../radar_tracks_noise_filter_node.hpp | 10 +++++----- .../test_radar_tracks_noise_filter_is_noise.cpp | 9 +++++---- 4 files changed, 22 insertions(+), 20 deletions(-) rename sensing/radar_tracks_noise_filter/src/{radar_tracks_noise_filter_node => }/radar_tracks_noise_filter_node.cpp (93%) rename sensing/radar_tracks_noise_filter/{include/radar_tracks_noise_filter => src}/radar_tracks_noise_filter_node.hpp (84%) diff --git a/sensing/radar_tracks_noise_filter/CMakeLists.txt b/sensing/radar_tracks_noise_filter/CMakeLists.txt index a257821a90198..436c3472c8734 100644 --- a/sensing/radar_tracks_noise_filter/CMakeLists.txt +++ b/sensing/radar_tracks_noise_filter/CMakeLists.txt @@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED) autoware_package() # Targets -ament_auto_add_library(radar_tracks_noise_filter_node_component SHARED - src/radar_tracks_noise_filter_node/radar_tracks_noise_filter_node.cpp +ament_auto_add_library(${PROJECT_NAME} SHARED + src/radar_tracks_noise_filter_node.cpp ) -rclcpp_components_register_node(radar_tracks_noise_filter_node_component - PLUGIN "radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode" +rclcpp_components_register_node(${PROJECT_NAME} + PLUGIN "autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode" EXECUTABLE radar_tracks_noise_filter_node ) @@ -22,10 +22,10 @@ if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() file(GLOB_RECURSE test_files test/**/*.cpp) - ament_add_ros_isolated_gtest(radar_tracks_noise_filter ${test_files}) + ament_add_ros_isolated_gtest(${PROJECT_NAME}_test ${test_files}) - target_link_libraries(radar_tracks_noise_filter - radar_tracks_noise_filter_node_component + target_link_libraries(${PROJECT_NAME}_test + ${PROJECT_NAME} ) endif() diff --git a/sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node/radar_tracks_noise_filter_node.cpp b/sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node.cpp similarity index 93% rename from sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node/radar_tracks_noise_filter_node.cpp rename to sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node.cpp index 82a0a21ff6fdc..c71a95c4f59f0 100644 --- a/sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node/radar_tracks_noise_filter_node.cpp +++ b/sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node.cpp @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp" +#include "radar_tracks_noise_filter_node.hpp" #include #include @@ -38,7 +38,7 @@ bool update_param( } } // namespace -namespace radar_tracks_noise_filter +namespace autoware::radar_tracks_noise_filter { using radar_msgs::msg::RadarTrack; using radar_msgs::msg::RadarTracks; @@ -116,7 +116,8 @@ bool RadarTrackCrossingNoiseFilterNode::isNoise(const RadarTrack & radar_track) } } -} // namespace radar_tracks_noise_filter +} // namespace autoware::radar_tracks_noise_filter #include "rclcpp_components/register_node_macro.hpp" -RCLCPP_COMPONENTS_REGISTER_NODE(radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode) +RCLCPP_COMPONENTS_REGISTER_NODE( + autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode) diff --git a/sensing/radar_tracks_noise_filter/include/radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp b/sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node.hpp similarity index 84% rename from sensing/radar_tracks_noise_filter/include/radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp rename to sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node.hpp index 2ff4025cc64bc..9262c34167363 100644 --- a/sensing/radar_tracks_noise_filter/include/radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp +++ b/sensing/radar_tracks_noise_filter/src/radar_tracks_noise_filter_node.hpp @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef RADAR_TRACKS_NOISE_FILTER__RADAR_TRACKS_NOISE_FILTER_NODE_HPP_ -#define RADAR_TRACKS_NOISE_FILTER__RADAR_TRACKS_NOISE_FILTER_NODE_HPP_ +#ifndef RADAR_TRACKS_NOISE_FILTER_NODE_HPP_ +#define RADAR_TRACKS_NOISE_FILTER_NODE_HPP_ #include "rclcpp/rclcpp.hpp" @@ -23,7 +23,7 @@ #include #include -namespace radar_tracks_noise_filter +namespace autoware::radar_tracks_noise_filter { using radar_msgs::msg::RadarTrack; using radar_msgs::msg::RadarTracks; @@ -62,6 +62,6 @@ class RadarTrackCrossingNoiseFilterNode : public rclcpp::Node bool isNoise(const RadarTrack & radar_track); }; -} // namespace radar_tracks_noise_filter +} // namespace autoware::radar_tracks_noise_filter -#endif // RADAR_TRACKS_NOISE_FILTER__RADAR_TRACKS_NOISE_FILTER_NODE_HPP_ +#endif // RADAR_TRACKS_NOISE_FILTER_NODE_HPP_ diff --git a/sensing/radar_tracks_noise_filter/test/radar_tracks_noise_filter/test_radar_tracks_noise_filter_is_noise.cpp b/sensing/radar_tracks_noise_filter/test/radar_tracks_noise_filter/test_radar_tracks_noise_filter_is_noise.cpp index aa08260dee2e7..ea2dfc28b5a4c 100644 --- a/sensing/radar_tracks_noise_filter/test/radar_tracks_noise_filter/test_radar_tracks_noise_filter_is_noise.cpp +++ b/sensing/radar_tracks_noise_filter/test/radar_tracks_noise_filter/test_radar_tracks_noise_filter_is_noise.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "radar_tracks_noise_filter/radar_tracks_noise_filter_node.hpp" +#include "../../src/radar_tracks_noise_filter_node.hpp" #include #include -std::shared_ptr get_node( +std::shared_ptr get_node( float velocity_y_threshold) { rclcpp::NodeOptions node_options; @@ -28,7 +28,8 @@ std::shared_ptr ge }); auto node = - std::make_shared(node_options); + std::make_shared( + node_options); return node; } @@ -45,8 +46,8 @@ radar_msgs::msg::RadarTrack getRadarTrack(float velocity_x, float velocity_y) TEST(RadarTracksNoiseFilter, isNoise) { + using autoware::radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode; using radar_msgs::msg::RadarTrack; - using radar_tracks_noise_filter::RadarTrackCrossingNoiseFilterNode; rclcpp::init(0, nullptr); { float velocity_node_threshold = 0.0;