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(behavior_path_avoidance_by_lane_change_module)!: prefix package and namespace with autoware #7309

Closed
wants to merge 2 commits into from
Closed

refactor(behavior_path_avoidance_by_lane_change_module)!: prefix package and namespace with autoware #7309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9df359
chore(autoware_behavior_path_avoidance_by_lane_change_module): rename
satoshi-ota Jun 6, 2024
17e826c
chore(autoware_behavior_path_avoidance_by_lane_change_module): rename…
satoshi-ota Jun 6, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ planning/autoware_behavior_velocity_virtual_traffic_light_module/** kosuke.takeu
planning/autoware_planning_test_manager/** [email protected] [email protected]
planning/autoware_remaining_distance_time_calculator/** [email protected]
planning/autoware_static_centerline_generator/** [email protected] [email protected]
planning/behavior_path_avoidance_by_lane_change_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/autoware_behavior_path_avoidance_by_lane_change_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/behavior_path_avoidance_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/behavior_path_dynamic_avoidance_module/** [email protected] [email protected] [email protected] [email protected]
planning/behavior_path_goal_planner_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
Expand Down
2 changes: 1 addition & 1 deletion planning/.pages
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ nav:
- 'Dynamic Drivable Area': planning/autoware_behavior_path_planner_common/docs/behavior_path_planner_drivable_area_design
- 'Turn Signal': planning/autoware_behavior_path_planner_common/docs/behavior_path_planner_turn_signal_design
- 'Scene Module':
- 'Avoidance by Lane Change': planning/behavior_path_avoidance_by_lane_change_module
- 'Avoidance by Lane Change': planning/autoware_behavior_path_avoidance_by_lane_change_module
- 'Dynamic Obstacle Avoidance': planning/autoware_behavior_path_dynamic_obstacle_avoidance_module
- 'Goal Planner': planning/behavior_path_goal_planner_module
- 'Lane Change': planning/behavior_path_lane_change_module
Expand Down
2 changes: 1 addition & 1 deletion ...ance_by_lane_change_module/CMakeLists.txt → ...ance_by_lane_change_module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(behavior_path_avoidance_by_lane_change_module)
project(autoware_behavior_path_avoidance_by_lane_change_module)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
0 ...avoidance_by_lane_change_module/README.md → ...avoidance_by_lane_change_module/README.md
View file
Open in desktop
File renamed without changes.
0 ...onfig/avoidance_by_lane_change.param.yaml → ...onfig/avoidance_by_lane_change.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...odule/images/avoidance_by_lane_change.svg → ...odule/images/avoidance_by_lane_change.svg
View file
Open in desktop
File renamed without changes
0 ...dule/images/avoidance_by_lc_trigger_1.svg → ...dule/images/avoidance_by_lc_trigger_1.svg
View file
Open in desktop
File renamed without changes
0 ...dule/images/avoidance_by_lc_trigger_2.svg → ...dule/images/avoidance_by_lc_trigger_2.svg
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions ...ce_by_lane_change_module/data_structs.hpp → ...ce_by_lane_change_module/data_structs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_
#define BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_
#define AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_

#include "autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp"

Expand All @@ -32,4 +32,4 @@ struct AvoidanceByLCParameters : public AvoidanceParameters
};
} // namespace behavior_path_planner

#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__DATA_STRUCTS_HPP_
10 changes: 5 additions & 5 deletions ...dance_by_lane_change_module/interface.hpp → ...dance_by_lane_change_module/interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_
#define BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_
#define AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_

#include "behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "behavior_path_avoidance_by_lane_change_module/scene.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/scene.hpp"
#include "behavior_path_lane_change_module/interface.hpp"

#include <rclcpp/rclcpp.hpp>
Expand Down Expand Up @@ -47,4 +47,4 @@ class AvoidanceByLaneChangeInterface : public LaneChangeInterface
};
} // namespace behavior_path_planner

#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__INTERFACE_HPP_
10 changes: 5 additions & 5 deletions ...oidance_by_lane_change_module/manager.hpp → ...oidance_by_lane_change_module/manager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_
#define BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_
#define AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_

#include "behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "behavior_path_avoidance_by_lane_change_module/interface.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/interface.hpp"
#include "behavior_path_lane_change_module/manager.hpp"

#include <rclcpp/rclcpp.hpp>
Expand Down Expand Up @@ -49,4 +49,4 @@ class AvoidanceByLaneChangeModuleManager : public LaneChangeModuleManager
};
} // namespace behavior_path_planner

#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__MANAGER_HPP_
8 changes: 4 additions & 4 deletions ...avoidance_by_lane_change_module/scene.hpp → ...avoidance_by_lane_change_module/scene.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_
#define BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_
#define AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_

#include "autoware_behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp"
#include "behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "behavior_path_lane_change_module/scene.hpp"

#include <memory>
Expand Down Expand Up @@ -61,4 +61,4 @@ class AvoidanceByLaneChange : public NormalLaneChange
};
} // namespace behavior_path_planner

#endif // BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_AVOIDANCE_BY_LANE_CHANGE_MODULE__SCENE_HPP_
4 changes: 2 additions & 2 deletions ...oidance_by_lane_change_module/package.xml → ...oidance_by_lane_change_module/package.xml
View file
Open in desktop
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_avoidance_by_lane_change_module</name>
<name>autoware_behavior_path_avoidance_by_lane_change_module</name>
<version>0.1.0</version>
<description>The behavior_path_avoidance_by_lane_change_module package</description>
<description>The autoware_behavior_path_avoidance_by_lane_change_module package</description>

<maintainer email="[email protected]">Satoshi Ota</maintainer>
<maintainer email="[email protected]">Zulfaqar Azmi</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion ...oidance_by_lane_change_module/plugins.xml → ...oidance_by_lane_change_module/plugins.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<library path="behavior_path_avoidance_by_lane_change_module">
<library path="autoware_behavior_path_avoidance_by_lane_change_module">
<class type="behavior_path_planner::AvoidanceByLaneChangeModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
</library>
2 changes: 1 addition & 1 deletion ...e_by_lane_change_module/src/interface.cpp → ...e_by_lane_change_module/src/interface.cpp
View file
Open in desktop
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 "behavior_path_avoidance_by_lane_change_module/interface.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/interface.hpp"

#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
#include "autoware_behavior_path_planner_common/interface/scene_module_visitor.hpp"
Expand Down
4 changes: 2 additions & 2 deletions ...nce_by_lane_change_module/src/manager.cpp → ...nce_by_lane_change_module/src/manager.cpp
View file
Open in desktop
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.

#include "behavior_path_avoidance_by_lane_change_module/manager.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/manager.hpp"

#include "autoware_behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "autoware_behavior_path_static_obstacle_avoidance_module/parameter_helper.hpp"
#include "behavior_path_avoidance_by_lane_change_module/data_structs.hpp"
#include "tier4_autoware_utils/ros/parameter.hpp"
#include "tier4_autoware_utils/ros/update_param.hpp"

Expand Down
2 changes: 1 addition & 1 deletion ...dance_by_lane_change_module/src/scene.cpp → ...dance_by_lane_change_module/src/scene.cpp
View file
Open in desktop
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 "behavior_path_avoidance_by_lane_change_module/scene.hpp"
#include "autoware_behavior_path_avoidance_by_lane_change_module/scene.hpp"

#include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp"
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/objects_filtering.hpp"
Expand Down
26 changes: 13 additions & 13 deletions ..._behavior_path_planner_node_interface.cpp → ..._behavior_path_planner_node_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
node_options.parameter_overrides(params);

test_utils::updateNodeOptions(
node_options,
{planning_test_utils_dir + "/config/test_common.param.yaml",
planning_test_utils_dir + "/config/test_nearest_search.param.yaml",
planning_test_utils_dir + "/config/test_vehicle_info.param.yaml",
behavior_path_planner_dir + "/config/behavior_path_planner.param.yaml",
behavior_path_planner_dir + "/config/drivable_area_expansion.param.yaml",
behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
behavior_path_lane_change_module_dir + "/config/lane_change.param.yaml",
ament_index_cpp::get_package_share_directory(
"autoware_behavior_path_static_obstacle_avoidance_module") +
"/config/static_obstacle_avoidance.param.yaml",
ament_index_cpp::get_package_share_directory("behavior_path_avoidance_by_lane_change_module") +
"/config/avoidance_by_lane_change.param.yaml"});
node_options, {planning_test_utils_dir + "/config/test_common.param.yaml",
planning_test_utils_dir + "/config/test_nearest_search.param.yaml",
planning_test_utils_dir + "/config/test_vehicle_info.param.yaml",
behavior_path_planner_dir + "/config/behavior_path_planner.param.yaml",
behavior_path_planner_dir + "/config/drivable_area_expansion.param.yaml",
behavior_path_planner_dir + "/config/scene_module_manager.param.yaml",
behavior_path_lane_change_module_dir + "/config/lane_change.param.yaml",
ament_index_cpp::get_package_share_directory(
"autoware_behavior_path_static_obstacle_avoidance_module") +
"/config/static_obstacle_avoidance.param.yaml",
ament_index_cpp::get_package_share_directory(
"autoware_behavior_path_avoidance_by_lane_change_module") +
"/config/avoidance_by_lane_change.param.yaml"});

return std::make_shared<BehaviorPathPlannerNode>(node_options);
}
Expand Down
2 changes: 1 addition & 1 deletion planning/behavior_path_planner/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Behavior Path Planner has following scene modules
| Lane Following | this module generates reference path from lanelet centerline. | LINK |
| Static Obstacle Avoidance | this module generates avoidance path when there is objects that should be avoid. | [LINK](../autoware_behavior_path_static_obstacle_avoidance_module/README.md) |
| Dynamic Obstacle Avoidance | WIP | [LINK](../autoware_behavior_path_dynamic_obstacle_avoidance_module/README.md) |
| Avoidance By Lane Change | this module generates lane change path when there is objects that should be avoid. | [LINK](../behavior_path_avoidance_by_lane_change_module/README.md) |
| Avoidance By Lane Change | this module generates lane change path when there is objects that should be avoid. | [LINK](../autoware_behavior_path_avoidance_by_lane_change_module/README.md) |
| Lane Change | this module is performed when it is necessary and a collision check with other vehicles is cleared. | [LINK](../behavior_path_lane_change_module/README.md) |
| External Lane Change | WIP | LINK |
| Goal Planner | this module is performed when ego-vehicle is in the road lane and goal is in the shoulder lane. ego-vehicle will stop at the goal. | [LINK](../behavior_path_goal_planner_module/README.md) |
Expand Down
Loading