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.

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

build(behavior_path_external_request_lane_change_module): prefix package and namespace with autoware_ #6636

Merged
merged 17 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,13 @@ perception/traffic_light_map_based_detector/** shunsuke.miura@tier4.jp tao.zhong
perception/traffic_light_multi_camera_fusion/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/traffic_light_occlusion_predictor/** shunsuke.miura@tier4.jp tao.zhong@tier4.jp
perception/traffic_light_visualization/** tao.zhong@tier4.jp yukihiro.saito@tier4.jp
planning/autoware_behavior_path_external_request_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/autoware_planning_test_manager/** kyoichi.sugahara@tier4.jp takamasa.horibe@tier4.jp
planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.ai
planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp
planning/behavior_path_avoidance_by_lane_change_module/** fumiya.watanabe@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/behavior_path_avoidance_module/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/behavior_path_dynamic_avoidance_module/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp takayuki.murooka@tier4.jp yuki.takagi@tier4.jp
planning/behavior_path_external_request_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/behavior_path_goal_planner_module/** daniel.sanchez@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp mamoru.sobue@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp
planning/behavior_path_lane_change_module/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
planning/behavior_path_planner/** fumiya.watanabe@tier4.jp go.sakayori@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp zulfaqar.azmi@tier4.jp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@
/>
<let
name="behavior_path_planner_launch_modules"
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'behavior_path_planner::ExternalRequestLaneChangeRightModuleManager, '&quot;)"
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager, '&quot;)"
if="$(var launch_external_request_lane_change_right_module)"
/>
<let
name="behavior_path_planner_launch_modules"
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager, '&quot;)"
value="$(eval &quot;'$(var behavior_path_planner_launch_modules)' + 'autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager, '&quot;)"
if="$(var launch_external_request_lane_change_left_module)"
/>
<let
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(behavior_path_external_request_lane_change_module)
project(autoware_behavior_path_external_request_lane_change_module)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
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>behavior_path_external_request_lane_change_module</name>
<name>autoware_behavior_path_external_request_lane_change_module</name>
<version>0.1.0</version>
<description>The behavior_path_external_request_lane_change_module package</description>
<description>The autoware_behavior_path_external_request_lane_change_module package</description>

<maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>
<maintainer email="zulfaqar.azmi@tier4.jp">Zulfaqar Azmi</maintainer>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<library path="autoware_behavior_path_external_request_lane_change_module">
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
</library>
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "behavior_path_external_request_lane_change_module/manager.hpp"
#include "manager.hpp"

#include "behavior_path_external_request_lane_change_module/scene.hpp"
#include "behavior_path_lane_change_module/interface.hpp"
#include "scene.hpp"

namespace behavior_path_planner
namespace autoware::behavior_path_planner
{
using ::behavior_path_planner::LaneChangeInterface;

std::unique_ptr<SceneModuleInterface>
ExternalRequestLaneChangeRightModuleManager::createNewSceneModuleInstance()
Expand All @@ -38,12 +39,12 @@ ExternalRequestLaneChangeLeftModuleManager::createNewSceneModuleInstance()
std::make_unique<ExternalRequestLaneChange>(parameters_, direction_));
}

} // namespace behavior_path_planner
} // namespace autoware::behavior_path_planner

#include <pluginlib/class_list_macros.hpp>
PLUGINLIB_EXPORT_CLASS(
behavior_path_planner::ExternalRequestLaneChangeRightModuleManager,
behavior_path_planner::SceneModuleManagerInterface)
autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager,
::behavior_path_planner::SceneModuleManagerInterface)
PLUGINLIB_EXPORT_CLASS(
behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager,
behavior_path_planner::SceneModuleManagerInterface)
autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager,
::behavior_path_planner::SceneModuleManagerInterface)
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 BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__MANAGER_HPP_
#define BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__MANAGER_HPP_
#ifndef MANAGER_HPP_
#define MANAGER_HPP_

#include "behavior_path_lane_change_module/manager.hpp"
#include "route_handler/route_handler.hpp"
Expand All @@ -23,8 +23,12 @@
#include <memory>
#include <string>

namespace behavior_path_planner
namespace autoware::behavior_path_planner
{
using ::behavior_path_planner::LaneChangeModuleManager;
using ::behavior_path_planner::LaneChangeModuleType;
using ::behavior_path_planner::SceneModuleInterface;

class ExternalRequestLaneChangeRightModuleManager : public LaneChangeModuleManager
{
public:
Expand All @@ -49,6 +53,6 @@ class ExternalRequestLaneChangeLeftModuleManager : public LaneChangeModuleManage
}
std::unique_ptr<SceneModuleInterface> createNewSceneModuleInstance() override;
};
} // namespace behavior_path_planner
} // namespace autoware::behavior_path_planner

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

#include "behavior_path_external_request_lane_change_module/scene.hpp"
#include "scene.hpp"

#include <lanelet2_extension/utility/utilities.hpp>

#include <memory>

namespace behavior_path_planner
namespace autoware::behavior_path_planner
{
using ::behavior_path_planner::LaneChangeModuleType;

ExternalRequestLaneChange::ExternalRequestLaneChange(
const std::shared_ptr<LaneChangeParameters> & parameters, Direction direction)
: NormalLaneChange(parameters, LaneChangeModuleType::EXTERNAL_REQUEST, direction)
{
}
} // namespace behavior_path_planner
} // namespace autoware::behavior_path_planner
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_
#define BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_
#ifndef SCENE_HPP_
#define SCENE_HPP_

#include "behavior_path_lane_change_module/scene.hpp"

#include <memory>

namespace behavior_path_planner
namespace autoware::behavior_path_planner
{
using ::behavior_path_planner::Direction;
using ::behavior_path_planner::LaneChangeParameters;
using ::behavior_path_planner::NormalLaneChange;

class ExternalRequestLaneChange : public NormalLaneChange
{
public:
Expand All @@ -33,6 +37,6 @@ class ExternalRequestLaneChange : public NormalLaneChange
ExternalRequestLaneChange & operator=(ExternalRequestLaneChange &&) = delete;
~ExternalRequestLaneChange() override = default;
};
} // namespace behavior_path_planner
} // namespace autoware::behavior_path_planner

#endif // BEHAVIOR_PATH_EXTERNAL_REQUEST_LANE_CHANGE_MODULE__SCENE_HPP_
#endif // SCENE_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <cmath>
#include <vector>

using behavior_path_planner::BehaviorPathPlannerNode;
using ::behavior_path_planner::BehaviorPathPlannerNode;
using planning_test_utils::PlanningInterfaceTestManager;

std::shared_ptr<PlanningInterfaceTestManager> generateTestManager()
Expand Down Expand Up @@ -51,8 +51,10 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");

std::vector<std::string> module_names;
module_names.emplace_back("behavior_path_planner::ExternalRequestLaneChangeRightModuleManager");
module_names.emplace_back("behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager");
module_names.emplace_back(
"autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager");
module_names.emplace_back(
"autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager");

std::vector<rclcpp::Parameter> params;
params.emplace_back("launch_modules", module_names);
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions planning/behavior_path_lane_change_module/plugins.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<library path="behavior_path_lane_change_module">
<class type="behavior_path_planner::LaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
<class type="behavior_path_planner::LaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
<class type="behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
<class type="behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
<class type="autoware::behavior_path_planner::ExternalRequestLaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
</library>
Loading