From e5f24f60b059820ae9fcf1854cec180360f8672f Mon Sep 17 00:00:00 2001 From: Berkay Karaman Date: Tue, 6 Jun 2023 16:19:38 +0300 Subject: [PATCH] update Signed-off-by: Berkay Karaman --- control/predicted_path_checker/CMakeLists.txt | 22 +++++++++---------- .../collision_checker.hpp | 4 ++-- .../predicted_path_checker/debug_marker.hpp | 4 ++-- .../predicted_path_checker_node.hpp | 4 ++-- .../collision_checker.cpp | 4 ++-- .../debug_marker.cpp | 4 ++-- .../predicted_path_checker_node.cpp | 7 +++--- 7 files changed, 24 insertions(+), 25 deletions(-) diff --git a/control/predicted_path_checker/CMakeLists.txt b/control/predicted_path_checker/CMakeLists.txt index d5e9de0addc03..36ea06f6835a3 100644 --- a/control/predicted_path_checker/CMakeLists.txt +++ b/control/predicted_path_checker/CMakeLists.txt @@ -6,7 +6,11 @@ autoware_package() find_package(Eigen3 REQUIRED) - +include_directories( + include + SYSTEM + ${Eigen3_INCLUDE_DIRS} +) ament_auto_add_library(predicted_path_checker SHARED src/predicted_path_checker_node/predicted_path_checker_node.cpp @@ -16,22 +20,18 @@ ament_auto_add_library(predicted_path_checker SHARED ) -target_include_directories(predicted_path_checker - SYSTEM PUBLIC - ${EIGEN3_INCLUDE_DIR} -) - rclcpp_components_register_node(predicted_path_checker - PLUGIN "predicted_path_checker::PredictedPathCheckerNode" + PLUGIN "autoware::motion::control::predicted_path_checker::PredictedPathCheckerNode" EXECUTABLE predicted_path_checker_node ) if(BUILD_TESTING) - + find_package(ament_lint_auto REQUIRED) + ament_lint_auto_find_test_dependencies() endif() ament_auto_package( INSTALL_TO_SHARE - launch - config -) + launch + config +) \ No newline at end of file diff --git a/control/predicted_path_checker/include/predicted_path_checker/collision_checker.hpp b/control/predicted_path_checker/include/predicted_path_checker/collision_checker.hpp index 9cc66af3e070f..d21b11e5b68de 100644 --- a/control/predicted_path_checker/include/predicted_path_checker/collision_checker.hpp +++ b/control/predicted_path_checker/include/predicted_path_checker/collision_checker.hpp @@ -40,7 +40,7 @@ #include #include -namespace predicted_path_checker +namespace autoware::motion::control::predicted_path_checker { using autoware_auto_planning_msgs::msg::Trajectory; using autoware_auto_planning_msgs::msg::TrajectoryPoint; @@ -123,6 +123,6 @@ class CollisionChecker vehicle_info_util::VehicleInfo vehicle_info_; std::vector predicted_object_history_{}; }; -} // namespace predicted_path_checker +} // namespace autoware::motion::control::predicted_path_checker #endif // PREDICTED_PATH_CHECKER__COLLISION_CHECKER_HPP_ diff --git a/control/predicted_path_checker/include/predicted_path_checker/debug_marker.hpp b/control/predicted_path_checker/include/predicted_path_checker/debug_marker.hpp index 51feee6b3a70c..02ade624d630c 100644 --- a/control/predicted_path_checker/include/predicted_path_checker/debug_marker.hpp +++ b/control/predicted_path_checker/include/predicted_path_checker/debug_marker.hpp @@ -35,7 +35,7 @@ #include #include -namespace predicted_path_checker +namespace autoware::motion::control::predicted_path_checker { enum class PolygonType : int8_t { Vehicle = 0, Collision }; @@ -87,6 +87,6 @@ class PredictedPathCheckerDebugNode std::vector> collision_polyhedrons_; }; -} // namespace predicted_path_checker +} // namespace autoware::motion::control::predicted_path_checker #endif // PREDICTED_PATH_CHECKER__DEBUG_MARKER_HPP_ diff --git a/control/predicted_path_checker/include/predicted_path_checker/predicted_path_checker_node.hpp b/control/predicted_path_checker/include/predicted_path_checker/predicted_path_checker_node.hpp index d553fdfe87806..e3c3b5cccfb8f 100644 --- a/control/predicted_path_checker/include/predicted_path_checker/predicted_path_checker_node.hpp +++ b/control/predicted_path_checker/include/predicted_path_checker/predicted_path_checker_node.hpp @@ -45,7 +45,7 @@ #include #include -namespace predicted_path_checker +namespace autoware::motion::control::predicted_path_checker { using autoware_auto_planning_msgs::msg::Trajectory; using autoware_auto_planning_msgs::msg::TrajectoryPoint; @@ -173,6 +173,6 @@ class PredictedPathCheckerNode : public rclcpp::Node // Diagnostic Updater diagnostic_updater::Updater updater_; }; -} // namespace predicted_path_checker +} // namespace autoware::motion::control::predicted_path_checker #endif // PREDICTED_PATH_CHECKER__PREDICTED_PATH_CHECKER_NODE_HPP_ diff --git a/control/predicted_path_checker/src/predicted_path_checker_node/collision_checker.cpp b/control/predicted_path_checker/src/predicted_path_checker_node/collision_checker.cpp index 3e985d6a8c728..5e8d96805b832 100644 --- a/control/predicted_path_checker/src/predicted_path_checker_node/collision_checker.cpp +++ b/control/predicted_path_checker/src/predicted_path_checker_node/collision_checker.cpp @@ -21,7 +21,7 @@ #include #include -namespace predicted_path_checker +namespace autoware::motion::control::predicted_path_checker { CollisionChecker::CollisionChecker( rclcpp::Node * node, std::shared_ptr debug_ptr) @@ -228,4 +228,4 @@ CollisionChecker::checkDynamicObjects( } return boost::none; } -} // namespace predicted_path_checker +} // namespace autoware::motion::control::predicted_path_checker diff --git a/control/predicted_path_checker/src/predicted_path_checker_node/debug_marker.cpp b/control/predicted_path_checker/src/predicted_path_checker_node/debug_marker.cpp index b3c5b8a8e8707..4b7b2b70ebef9 100644 --- a/control/predicted_path_checker/src/predicted_path_checker_node/debug_marker.cpp +++ b/control/predicted_path_checker/src/predicted_path_checker_node/debug_marker.cpp @@ -38,7 +38,7 @@ using tier4_autoware_utils::createMarkerOrientation; using tier4_autoware_utils::createMarkerScale; using tier4_autoware_utils::createPoint; -namespace predicted_path_checker +namespace autoware::motion::control::predicted_path_checker { PredictedPathCheckerDebugNode::PredictedPathCheckerDebugNode( rclcpp::Node * node, const double base_link2front) @@ -326,4 +326,4 @@ visualization_msgs::msg::MarkerArray PredictedPathCheckerDebugNode::makeVisualiz return msg; } -} // namespace predicted_path_checker +} // namespace autoware::motion::control::predicted_path_checker diff --git a/control/predicted_path_checker/src/predicted_path_checker_node/predicted_path_checker_node.cpp b/control/predicted_path_checker/src/predicted_path_checker_node/predicted_path_checker_node.cpp index 34186a0c8e243..a588291491d41 100644 --- a/control/predicted_path_checker/src/predicted_path_checker_node/predicted_path_checker_node.cpp +++ b/control/predicted_path_checker/src/predicted_path_checker_node/predicted_path_checker_node.cpp @@ -27,7 +27,7 @@ #include #include -namespace predicted_path_checker +namespace autoware::motion::control::predicted_path_checker { PredictedPathCheckerNode::PredictedPathCheckerNode(const rclcpp::NodeOptions & node_options) @@ -579,8 +579,7 @@ void PredictedPathCheckerNode::filterObstacles( } } -} // namespace predicted_path_checker +} // namespace autoware::motion::control::predicted_path_checker #include - -RCLCPP_COMPONENTS_REGISTER_NODE(predicted_path_checker::PredictedPathCheckerNode) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::motion::control::predicted_path_checker::PredictedPathCheckerNode)