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(radar_object_clustering)!: fix namespace and directory structure #7654

Merged
merged 3 commits into from
Jun 27, 2024
Merged

refactor(radar_object_clustering)!: fix namespace and directory structure #7654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8ba462
refactor: refactor radar object clustering node and related files
technolojin Jun 24, 2024
c2f1e2c
refactor: fix the node name
technolojin Jun 25, 2024
4fe6beb
refactor: move the node header to src
technolojin Jun 26, 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
8 changes: 4 additions & 4 deletions perception/radar_object_clustering/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ find_package(autoware_cmake REQUIRED)
autoware_package()

# Targets
ament_auto_add_library(radar_object_clustering_node_component SHARED
src/radar_object_clustering_node/radar_object_clustering_node.cpp
ament_auto_add_library(${PROJECT_NAME} SHARED
src/radar_object_clustering_node.cpp
)

rclcpp_components_register_node(radar_object_clustering_node_component
PLUGIN "radar_object_clustering::RadarObjectClusteringNode"
rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::radar_object_clustering::RadarObjectClusteringNode"
EXECUTABLE radar_object_clustering_node
)

Expand Down
19 changes: 10 additions & 9 deletions ...ing_node/radar_object_clustering_node.cpp → ...ring/src/radar_object_clustering_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "radar_object_clustering/radar_object_clustering_node.hpp"
#include "radar_object_clustering_node.hpp"

#include "autoware/universe_utils/geometry/geometry.hpp"
#include "autoware/universe_utils/math/unit_conversion.hpp"
#include "object_recognition_utils/object_recognition_utils.hpp"

#include <tf2/utils.h>

#include <cmath>
#include <memory>
#include <string>
#include <vector>

#ifdef ROS_DISTRO_GALACTIC
#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
#else
#include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
#endif

#include <algorithm>
#include <cmath>
#include <memory>
#include <string>
#include <vector>

namespace
{
template <class T>
Expand Down Expand Up @@ -58,7 +59,7 @@

} // namespace

namespace radar_object_clustering
namespace autoware::radar_object_clustering
{
using autoware_perception_msgs::msg::DetectedObject;
using autoware_perception_msgs::msg::DetectedObjects;
Expand Down Expand Up @@ -229,7 +230,7 @@
result.reason = "success";
return result;
}
} // namespace radar_object_clustering
} // namespace autoware::radar_object_clustering

#include "rclcpp_components/register_node_macro.hpp"
RCLCPP_COMPONENTS_REGISTER_NODE(radar_object_clustering::RadarObjectClusteringNode)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::radar_object_clustering::RadarObjectClusteringNode)

Check warning on line 236 in perception/radar_object_clustering/src/radar_object_clustering_node.cpp

View check run for this annotation

Codecov / codecov/patch

perception/radar_object_clustering/src/radar_object_clustering_node.cpp#L236 

Added line #L236 was not covered by tests
10 changes: 5 additions & 5 deletions ...ustering/radar_object_clustering_node.hpp → ...ring/src/radar_object_clustering_node.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 RADAR_OBJECT_CLUSTERING__RADAR_OBJECT_CLUSTERING_NODE_HPP_
#define RADAR_OBJECT_CLUSTERING__RADAR_OBJECT_CLUSTERING_NODE_HPP_
#ifndef RADAR_OBJECT_CLUSTERING_NODE_HPP_
#define RADAR_OBJECT_CLUSTERING_NODE_HPP_

#include "rclcpp/rclcpp.hpp"

Expand All @@ -24,7 +24,7 @@
#include <string>
#include <vector>

namespace radar_object_clustering
namespace autoware::radar_object_clustering
{
using autoware_perception_msgs::msg::DetectedObject;
using autoware_perception_msgs::msg::DetectedObjects;
Expand Down Expand Up @@ -72,6 +72,6 @@ class RadarObjectClusteringNode : public rclcpp::Node
bool isSameObject(const DetectedObject & object_1, const DetectedObject & object_2);
};

} // namespace radar_object_clustering
} // namespace autoware::radar_object_clustering

#endif // RADAR_OBJECT_CLUSTERING__RADAR_OBJECT_CLUSTERING_NODE_HPP_
#endif // RADAR_OBJECT_CLUSTERING_NODE_HPP_
Loading