Skip to content

Commit

Permalink
refactor(goal_distance_calculator): prefix package and namespace with…
Browse files Browse the repository at this point in the history
… autoware

Signed-off-by: Esteve Fernandez <[email protected]>
  • Loading branch information
esteve committed Oct 30, 2024
1 parent 94b9ad0 commit 9719408
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ common/autoware_auto_common/** [email protected] [email protected] shumpei.w
common/autoware_component_interface_specs/** [email protected] [email protected]
common/autoware_component_interface_tools/** [email protected]
common/autoware_geography_utils/** [email protected]
common/autoware_goal_distance_calculator/** [email protected]
common/autoware_grid_map_utils/** [email protected]
common/autoware_interpolation/** [email protected] [email protected]
common/autoware_kalman_filter/** [email protected] [email protected] [email protected]
Expand All @@ -26,7 +27,6 @@ common/component_interface_utils/** [email protected] [email protected]
common/fake_test_node/** [email protected] [email protected] [email protected] [email protected]
common/global_parameter_loader/** [email protected]
common/glog_component/** [email protected]
common/goal_distance_calculator/** [email protected]
common/qp_interface/** [email protected] [email protected] [email protected] [email protected]
common/tier4_adapi_rviz_plugin/** [email protected] [email protected] [email protected]
common/tier4_api_utils/** [email protected]
Expand Down
21 changes: 21 additions & 0 deletions common/autoware_goal_distance_calculator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_goal_distance_calculator)

find_package(autoware_cmake REQUIRED)
autoware_package()

ament_auto_add_library(${PROJECT_NAME} SHARED
src/goal_distance_calculator_node.cpp
src/goal_distance_calculator.cpp
)

rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::goal_distance_calculator::GoalDistanceCalculatorNode"
EXECUTABLE autoware_goal_distance_calculator_node
)

ament_auto_package(
INSTALL_TO_SHARE
launch
config
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# goal_distance_calculator
# autoware_goal_distance_calculator

## Purpose

Expand Down
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 GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
#define GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
#ifndef AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
#define AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_

#include <autoware/universe_utils/geometry/pose_deviation.hpp>
#include <rclcpp/rclcpp.hpp>
Expand All @@ -23,7 +23,7 @@

#include <boost/optional.hpp>

namespace goal_distance_calculator
namespace autoware::goal_distance_calculator
{
using autoware::universe_utils::PoseDeviation;

Expand Down Expand Up @@ -52,6 +52,6 @@ class GoalDistanceCalculator
private:
Param param_;
};
} // namespace goal_distance_calculator
} // namespace autoware::goal_distance_calculator

#endif // GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
#endif // AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
#define GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
#ifndef AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
#define AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_

#include "goal_distance_calculator/goal_distance_calculator.hpp"
#include "autoware/goal_distance_calculator/goal_distance_calculator.hpp"

#include <autoware/universe_utils/ros/debug_publisher.hpp>
#include <autoware/universe_utils/ros/polling_subscriber.hpp>
Expand All @@ -30,7 +30,7 @@

#include <memory>

namespace goal_distance_calculator
namespace autoware::goal_distance_calculator
{
struct NodeParam
{
Expand Down Expand Up @@ -66,5 +66,5 @@ class GoalDistanceCalculatorNode : public rclcpp::Node
// Core
std::unique_ptr<GoalDistanceCalculator> goal_distance_calculator_;
};
} // namespace goal_distance_calculator
#endif // GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
} // namespace autoware::goal_distance_calculator
#endif // AUTOWARE__GOAL_DISTANCE_CALCULATOR__GOAL_DISTANCE_CALCULATOR_NODE_HPP_
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<launch>
<arg name="config_file" default="$(find-pkg-share goal_distance_calculator)/config/goal_distance_calculator.param.yaml"/>
<node pkg="goal_distance_calculator" exec="goal_distance_calculator_node" name="goal_distance_calculator" output="screen">
<node pkg="autoware_goal_distance_calculator" exec="autoware_goal_distance_calculator_node" name="autoware_goal_distance_calculator" output="screen">
<param from="$(var config_file)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>goal_distance_calculator</name>
<name>autoware_goal_distance_calculator</name>
<version>0.0.0</version>
<description>The goal_distance_calculator package</description>
<description>The autoware_goal_distance_calculator package</description>
<maintainer email="[email protected]">Taiki Tanaka</maintainer>
<license>Apache License 2.0</license>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "goal_distance_calculator/goal_distance_calculator.hpp"
#include "autoware/goal_distance_calculator/goal_distance_calculator.hpp"

namespace goal_distance_calculator
namespace autoware::goal_distance_calculator
{
Output GoalDistanceCalculator::update(const Input & input)
{
Expand All @@ -26,4 +26,4 @@ Output GoalDistanceCalculator::update(const Input & input)
return output;
}

} // namespace goal_distance_calculator
} // namespace autoware::goal_distance_calculator
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "goal_distance_calculator/goal_distance_calculator_node.hpp"
#include "autoware/goal_distance_calculator/goal_distance_calculator_node.hpp"

#include <autoware/universe_utils/math/unit_conversion.hpp>
#include <rclcpp/rclcpp.hpp>
Expand All @@ -26,7 +26,7 @@
#include <string>
#include <utility>

namespace goal_distance_calculator
namespace autoware::goal_distance_calculator
{
GoalDistanceCalculatorNode::GoalDistanceCalculatorNode(const rclcpp::NodeOptions & options)
: Node("goal_distance_calculator", options),
Expand Down Expand Up @@ -117,7 +117,7 @@ void GoalDistanceCalculatorNode::onTimer()
rclcpp::shutdown();
}
}
} // namespace goal_distance_calculator
} // namespace autoware::goal_distance_calculator

#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(goal_distance_calculator::GoalDistanceCalculatorNode)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::goal_distance_calculator::GoalDistanceCalculatorNode)
21 changes: 0 additions & 21 deletions common/goal_distance_calculator/CMakeLists.txt

This file was deleted.

0 comments on commit 9719408

Please sign in to comment.