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

Merged
merged 1 commit into from
Jul 4, 2024
Merged

refactor(cluster_merger)!: fix namespace and directory structure #7738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/cluster_merger/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(cluster_merger_node_component SHARED
src/cluster_merger/node.cpp
ament_auto_add_library(${PROJECT_NAME} SHARED
src/cluster_merger_node.cpp
)

rclcpp_components_register_node(cluster_merger_node_component
PLUGIN "cluster_merger::ClusterMergerNode"
rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::cluster_merger::ClusterMergerNode"
EXECUTABLE cluster_merger_node)


Expand Down
9 changes: 5 additions & 4 deletions ...luster_merger/src/cluster_merger/node.cpp → ...luster_merger/src/cluster_merger_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "cluster_merger/node.hpp"
#include "cluster_merger_node.hpp"

#include "object_recognition_utils/object_recognition_utils.hpp"

#include <memory>
#include <string>
#include <vector>
namespace cluster_merger

namespace autoware::cluster_merger
{

ClusterMergerNode::ClusterMergerNode(const rclcpp::NodeOptions & node_options)
Expand Down Expand Up @@ -67,7 +68,7 @@
transformed_objects1.feature_objects.end());
pub_objects_->publish(output_objects);
}
} // namespace cluster_merger
} // namespace autoware::cluster_merger

#include "rclcpp_components/register_node_macro.hpp"
RCLCPP_COMPONENTS_REGISTER_NODE(cluster_merger::ClusterMergerNode)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::cluster_merger::ClusterMergerNode)

Check warning on line 74 in perception/cluster_merger/src/cluster_merger_node.cpp

View check run for this annotation

Codecov / codecov/patch

perception/cluster_merger/src/cluster_merger_node.cpp#L74 

Added line #L74 was not covered by tests
10 changes: 5 additions & 5 deletions ...er_merger/include/cluster_merger/node.hpp → ...luster_merger/src/cluster_merger_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 CLUSTER_MERGER__NODE_HPP_
#define CLUSTER_MERGER__NODE_HPP_
#ifndef CLUSTER_MERGER_NODE_HPP_
#define CLUSTER_MERGER_NODE_HPP_

#include "autoware/universe_utils/ros/transform_listener.hpp"
#include "message_filters/subscriber.h"
Expand All @@ -31,7 +31,7 @@
#include <string>
#include <vector>

namespace cluster_merger
namespace autoware::cluster_merger
{
using tier4_perception_msgs::msg::DetectedObjectsWithFeature;
using tier4_perception_msgs::msg::DetectedObjectWithFeature;
Expand Down Expand Up @@ -68,6 +68,6 @@ class ClusterMergerNode : public rclcpp::Node
rclcpp::Publisher<DetectedObjectsWithFeature>::SharedPtr pub_objects_;
};

} // namespace cluster_merger
} // namespace autoware::cluster_merger

#endif // CLUSTER_MERGER__NODE_HPP_
#endif // CLUSTER_MERGER_NODE_HPP_
Loading