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_side_shift_module)!: prefix package and namespace with autoware #7326

Merged
merged 2 commits into from
Jun 7, 2024
Merged

refactor(behavior_path_side_shift_module)!: prefix package and namespace with autoware #7326

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
f835fbf
add prefix autoware_ to side_shift package
kyoichi-sugahara Jun 6, 2024
5013db9
change directory name
kyoichi-sugahara 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 @@ -160,7 +160,7 @@ planning/behavior_path_lane_change_module/** [email protected] kosuke.tak
planning/behavior_path_planner/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/autoware_behavior_path_planner_common/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/behavior_path_sampling_planner_module/** [email protected] [email protected]
planning/behavior_path_side_shift_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/autoware_behavior_path_side_shift_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/behavior_path_start_planner_module/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
planning/behavior_velocity_blind_spot_module/** [email protected] [email protected] [email protected]
planning/behavior_velocity_crosswalk_module/** [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 @@ -14,7 +14,7 @@ nav:
- '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
- 'Side Shift': planning/behavior_path_side_shift_module
- 'Side Shift': planning/autoware_behavior_path_side_shift_module
- 'Start Planner': planning/behavior_path_start_planner_module
- 'Static Obstacle Avoidance': planning/autoware_behavior_path_static_obstacle_avoidance_module
- 'Behavior Velocity Planner':
Expand Down
2 changes: 1 addition & 1 deletion ...ior_path_side_shift_module/CMakeLists.txt → ...ior_path_side_shift_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_side_shift_module)
project(autoware_behavior_path_side_shift_module)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
0 ...behavior_path_side_shift_module/README.md → ...behavior_path_side_shift_module/README.md
View file
Open in desktop
File renamed without changes.
0 ...shift_module/config/side_shift.param.yaml → ...shift_module/config/side_shift.param.yaml
View file
Open in desktop
File renamed without changes.
0 ...odule/images/side_shift_status.drawio.svg → ...odule/images/side_shift_status.drawio.svg
View file
Open in desktop
File renamed without changes
6 changes: 3 additions & 3 deletions ...r_path_side_shift_module/data_structs.hpp → ...r_path_side_shift_module/data_structs.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 BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_

#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"

Expand Down Expand Up @@ -51,4 +51,4 @@ struct SideShiftDebugData
};

} // namespace behavior_path_planner
#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__DATA_STRUCTS_HPP_
8 changes: 4 additions & 4 deletions ...havior_path_side_shift_module/manager.hpp → ...havior_path_side_shift_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_SIDE_SHIFT_MODULE__MANAGER_HPP_
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__MANAGER_HPP_

#include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp"
#include "behavior_path_side_shift_module/scene.hpp"
#include "autoware_behavior_path_side_shift_module/scene.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -50,4 +50,4 @@ class SideShiftModuleManager : public SceneModuleManagerInterface

} // namespace behavior_path_planner

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

#ifndef BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_

#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
#include "behavior_path_side_shift_module/data_structs.hpp"
#include "autoware_behavior_path_side_shift_module/data_structs.hpp"

#include <rclcpp/rclcpp.hpp>

Expand Down Expand Up @@ -131,4 +131,4 @@ class SideShiftModule : public SceneModuleInterface

} // namespace behavior_path_planner

#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__SCENE_HPP_
6 changes: 3 additions & 3 deletions ...behavior_path_side_shift_module/utils.hpp → ...behavior_path_side_shift_module/utils.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 BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
#define BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
#ifndef AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
#define AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_

#include <geometry_msgs/msg/point.hpp>
#include <geometry_msgs/msg/pose.hpp>
Expand Down Expand Up @@ -41,4 +41,4 @@ Point transformToGrid(

} // namespace behavior_path_planner

#endif // BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
#endif // AUTOWARE_BEHAVIOR_PATH_SIDE_SHIFT_MODULE__UTILS_HPP_
4 changes: 2 additions & 2 deletions ...havior_path_side_shift_module/package.xml → ...havior_path_side_shift_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_side_shift_module</name>
<name>autoware_behavior_path_side_shift_module</name>
<version>0.1.0</version>
<description>The behavior_path_side_shift_module package</description>
<description>The autoware_behavior_path_side_shift_module package</description>

<maintainer email="[email protected]">Satoshi Ota</maintainer>
<maintainer email="[email protected]">Fumiya Watanabe</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion ...havior_path_side_shift_module/plugins.xml → ...havior_path_side_shift_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_side_shift_module">
<library path="autoware_behavior_path_side_shift_module">
<class type="behavior_path_planner::SideShiftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
</library>
2 changes: 1 addition & 1 deletion ...or_path_side_shift_module/src/manager.cpp → ...or_path_side_shift_module/src/manager.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_side_shift_module/manager.hpp"
#include "autoware_behavior_path_side_shift_module/manager.hpp"

#include "tier4_autoware_utils/ros/update_param.hpp"

Expand Down
4 changes: 2 additions & 2 deletions ...vior_path_side_shift_module/src/scene.cpp → ...vior_path_side_shift_module/src/scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "behavior_path_side_shift_module/scene.hpp"
#include "autoware_behavior_path_side_shift_module/scene.hpp"

#include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
#include "autoware_behavior_path_planner_common/utils/drivable_area_expansion/static_drivable_area.hpp"
#include "autoware_behavior_path_planner_common/utils/path_utils.hpp"
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
#include "behavior_path_side_shift_module/utils.hpp"
#include "autoware_behavior_path_side_shift_module/utils.hpp"

#include <lanelet2_extension/utility/utilities.hpp>

Expand Down
2 changes: 1 addition & 1 deletion ...vior_path_side_shift_module/src/utils.cpp → ...vior_path_side_shift_module/src/utils.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_side_shift_module/utils.hpp"
#include "autoware_behavior_path_side_shift_module/utils.hpp"

#include "autoware_behavior_path_planner_common/utils/utils.hpp"

Expand Down
17 changes: 9 additions & 8 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 @@ -57,14 +57,15 @@ 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",
ament_index_cpp::get_package_share_directory("behavior_path_side_shift_module") +
"/config/side_shift.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",
ament_index_cpp::get_package_share_directory("autoware_behavior_path_side_shift_module") +
"/config/side_shift.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 @@ -34,7 +34,7 @@ Behavior Path Planner has following scene modules
| 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) |
| Start Planner | this module is performed when ego-vehicle is stationary and footprint of ego-vehicle is included in shoulder lane. This module ends when ego-vehicle merges into the road. | [LINK](../behavior_path_start_planner_module/README.md) |
| Side Shift | (for remote control) shift the path to left or right according to an external instruction. | [LINK](../behavior_path_side_shift_module/README.md) |
| Side Shift | (for remote control) shift the path to left or right according to an external instruction. | [LINK](../autoware_behavior_path_side_shift_module/README.md) |

!!! Note

Expand Down
Loading