Skip to content

Commit 2058c18

Browse files
authored
refactor(radar_object_clustering)!: fix namespace and directory structure (#7654)
* refactor: refactor radar object clustering node and related files Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: fix the node name Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: move the node header to src Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> --------- Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent 8614acc commit 2058c18

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

perception/radar_object_clustering/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
66
autoware_package()
77

88
# Targets
9-
ament_auto_add_library(radar_object_clustering_node_component SHARED
10-
src/radar_object_clustering_node/radar_object_clustering_node.cpp
9+
ament_auto_add_library(${PROJECT_NAME} SHARED
10+
src/radar_object_clustering_node.cpp
1111
)
1212

13-
rclcpp_components_register_node(radar_object_clustering_node_component
14-
PLUGIN "radar_object_clustering::RadarObjectClusteringNode"
13+
rclcpp_components_register_node(${PROJECT_NAME}
14+
PLUGIN "autoware::radar_object_clustering::RadarObjectClusteringNode"
1515
EXECUTABLE radar_object_clustering_node
1616
)
1717

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

15-
#include "radar_object_clustering/radar_object_clustering_node.hpp"
15+
#include "radar_object_clustering_node.hpp"
1616

1717
#include "autoware/universe_utils/geometry/geometry.hpp"
1818
#include "autoware/universe_utils/math/unit_conversion.hpp"
1919
#include "object_recognition_utils/object_recognition_utils.hpp"
2020

2121
#include <tf2/utils.h>
2222

23-
#include <cmath>
24-
#include <memory>
25-
#include <string>
26-
#include <vector>
27-
2823
#ifdef ROS_DISTRO_GALACTIC
2924
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
3025
#else
3126
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
3227
#endif
3328

29+
#include <algorithm>
30+
#include <cmath>
31+
#include <memory>
32+
#include <string>
33+
#include <vector>
34+
3435
namespace
3536
{
3637
template <class T>
@@ -58,7 +59,7 @@ double get_distance(const autoware_perception_msgs::msg::DetectedObject & object
5859

5960
} // namespace
6061

61-
namespace radar_object_clustering
62+
namespace autoware::radar_object_clustering
6263
{
6364
using autoware_perception_msgs::msg::DetectedObject;
6465
using autoware_perception_msgs::msg::DetectedObjects;
@@ -229,7 +230,7 @@ rcl_interfaces::msg::SetParametersResult RadarObjectClusteringNode::onSetParam(
229230
result.reason = "success";
230231
return result;
231232
}
232-
} // namespace radar_object_clustering
233+
} // namespace autoware::radar_object_clustering
233234

234235
#include "rclcpp_components/register_node_macro.hpp"
235-
RCLCPP_COMPONENTS_REGISTER_NODE(radar_object_clustering::RadarObjectClusteringNode)
236+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::radar_object_clustering::RadarObjectClusteringNode)
+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef RADAR_OBJECT_CLUSTERING__RADAR_OBJECT_CLUSTERING_NODE_HPP_
16-
#define RADAR_OBJECT_CLUSTERING__RADAR_OBJECT_CLUSTERING_NODE_HPP_
15+
#ifndef RADAR_OBJECT_CLUSTERING_NODE_HPP_
16+
#define RADAR_OBJECT_CLUSTERING_NODE_HPP_
1717

1818
#include "rclcpp/rclcpp.hpp"
1919

@@ -24,7 +24,7 @@
2424
#include <string>
2525
#include <vector>
2626

27-
namespace radar_object_clustering
27+
namespace autoware::radar_object_clustering
2828
{
2929
using autoware_perception_msgs::msg::DetectedObject;
3030
using autoware_perception_msgs::msg::DetectedObjects;
@@ -72,6 +72,6 @@ class RadarObjectClusteringNode : public rclcpp::Node
7272
bool isSameObject(const DetectedObject & object_1, const DetectedObject & object_2);
7373
};
7474

75-
} // namespace radar_object_clustering
75+
} // namespace autoware::radar_object_clustering
7676

77-
#endif // RADAR_OBJECT_CLUSTERING__RADAR_OBJECT_CLUSTERING_NODE_HPP_
77+
#endif // RADAR_OBJECT_CLUSTERING_NODE_HPP_

0 commit comments

Comments
 (0)