Skip to content

Commit f7ac46f

Browse files
authored
refactor(behavior_path_lane_change_module)!: prefix package and namespace with autoware (autowarefoundation#7370)
Signed-off-by: Fumiya Watanabe <rej55.g@gmail.com>
1 parent 7a55d57 commit f7ac46f

File tree

57 files changed

+80
-82
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+80
-82
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ planning/autoware_remaining_distance_time_calculator/** ahmed.ebrahim@leodrive.a
164164
planning/autoware_static_centerline_generator/** kosuke.takeuchi@tier4.jp takayuki.murooka@tier4.jp
165165
planning/autoware_velocity_smoother/** fumiya.watanabe@tier4.jp makoto.kurihara@tier4.jp satoshi.ota@tier4.jp takamasa.horibe@tier4.jp
166166
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
167-
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
167+
planning/autoware_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
168168
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
169169
planning/behavior_path_sampling_planner_module/** daniel.sanchez@tier4.jp maxime.clement@tier4.jp
170170
planning/autoware_behavior_path_side_shift_module/** fumiya.watanabe@tier4.jp kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomohito.ando@tier4.jp tomoya.kimura@tier4.jp

planning/.pages

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ nav:
1313
- 'Avoidance by Lane Change': planning/autoware_behavior_path_avoidance_by_lane_change_module
1414
- 'Dynamic Obstacle Avoidance': planning/autoware_behavior_path_dynamic_obstacle_avoidance_module
1515
- 'Goal Planner': planning/behavior_path_goal_planner_module
16-
- 'Lane Change': planning/behavior_path_lane_change_module
16+
- 'Lane Change': planning/autoware_behavior_path_lane_change_module
1717
- 'Side Shift': planning/autoware_behavior_path_side_shift_module
1818
- 'Start Planner': planning/autoware_behavior_path_start_planner_module
1919
- 'Static Obstacle Avoidance': planning/autoware_behavior_path_static_obstacle_avoidance_module

planning/autoware_behavior_path_avoidance_by_lane_change_module/README.md

+1-1

planning/autoware_behavior_path_avoidance_by_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
<buildtool_depend>autoware_cmake</buildtool_depend>
1919
<buildtool_depend>eigen3_cmake_module</buildtool_depend>
2020

21+
<depend>autoware_behavior_path_lane_change_module</depend>
2122
<depend>autoware_behavior_path_planner_common</depend>
2223
<depend>autoware_behavior_path_static_obstacle_avoidance_module</depend>
2324
<depend>autoware_rtc_interface</depend>
24-
<depend>behavior_path_lane_change_module</depend>
2525
<depend>behavior_path_planner</depend>
2626
<depend>lanelet2_extension</depend>
2727
<depend>motion_utils</depend>

planning/autoware_behavior_path_avoidance_by_lane_change_module/src/interface.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef INTERFACE_HPP_
1616
#define INTERFACE_HPP_
1717

18-
#include "behavior_path_lane_change_module/interface.hpp"
18+
#include "autoware_behavior_path_lane_change_module/interface.hpp"
1919
#include "data_structs.hpp"
2020
#include "scene.hpp"
2121

planning/autoware_behavior_path_avoidance_by_lane_change_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef MANAGER_HPP_
1616
#define MANAGER_HPP_
1717

18-
#include "behavior_path_lane_change_module/manager.hpp"
18+
#include "autoware_behavior_path_lane_change_module/manager.hpp"
1919
#include "data_structs.hpp"
2020
#include "interface.hpp"
2121

planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
2121
#include "autoware_behavior_path_static_obstacle_avoidance_module/utils.hpp"
2222

23+
#include <autoware_behavior_path_lane_change_module/utils/utils.hpp>
2324
#include <autoware_behavior_path_static_obstacle_avoidance_module/data_structs.hpp>
24-
#include <behavior_path_lane_change_module/utils/utils.hpp>
2525
#include <lanelet2_extension/utility/utilities.hpp>
2626
#include <rclcpp/logging.hpp>
2727

planning/autoware_behavior_path_avoidance_by_lane_change_module/src/scene.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
#ifndef SCENE_HPP_
1616
#define SCENE_HPP_
1717

18+
#include "autoware_behavior_path_lane_change_module/scene.hpp"
1819
#include "autoware_behavior_path_static_obstacle_avoidance_module/helper.hpp"
19-
#include "behavior_path_lane_change_module/scene.hpp"
2020
#include "data_structs.hpp"
2121

2222
#include <memory>

planning/autoware_behavior_path_avoidance_by_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
4949
const auto behavior_path_planner_dir =
5050
ament_index_cpp::get_package_share_directory("behavior_path_planner");
5151
const auto behavior_path_lane_change_module_dir =
52-
ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
52+
ament_index_cpp::get_package_share_directory("autoware_behavior_path_lane_change_module");
5353

5454
std::vector<std::string> module_names;
5555
module_names.emplace_back("autoware::behavior_path_planner::AvoidanceByLaneChangeModuleManager");

planning/autoware_behavior_path_external_request_lane_change_module/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<buildtool_depend>autoware_cmake</buildtool_depend>
1919
<buildtool_depend>eigen3_cmake_module</buildtool_depend>
2020

21+
<depend>autoware_behavior_path_lane_change_module</depend>
2122
<depend>autoware_behavior_path_planner_common</depend>
2223
<depend>autoware_rtc_interface</depend>
23-
<depend>behavior_path_lane_change_module</depend>
2424
<depend>behavior_path_planner</depend>
2525
<depend>motion_utils</depend>
2626
<depend>pluginlib</depend>

planning/autoware_behavior_path_external_request_lane_change_module/src/manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include "manager.hpp"
1616

17-
#include "behavior_path_lane_change_module/interface.hpp"
17+
#include "autoware_behavior_path_lane_change_module/interface.hpp"
1818
#include "scene.hpp"
1919

2020
namespace autoware::behavior_path_planner

planning/autoware_behavior_path_external_request_lane_change_module/src/manager.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef MANAGER_HPP_
1616
#define MANAGER_HPP_
1717

18-
#include "behavior_path_lane_change_module/manager.hpp"
18+
#include "autoware_behavior_path_lane_change_module/manager.hpp"
1919
#include "route_handler/route_handler.hpp"
2020

2121
#include <rclcpp/rclcpp.hpp>

planning/autoware_behavior_path_external_request_lane_change_module/src/scene.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#ifndef SCENE_HPP_
1616
#define SCENE_HPP_
1717

18-
#include "behavior_path_lane_change_module/scene.hpp"
18+
#include "autoware_behavior_path_lane_change_module/scene.hpp"
1919

2020
#include <memory>
2121

planning/autoware_behavior_path_external_request_lane_change_module/test/test_behavior_path_planner_node_interface.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ std::shared_ptr<BehaviorPathPlannerNode> generateNode()
4848
const auto behavior_path_planner_dir =
4949
ament_index_cpp::get_package_share_directory("behavior_path_planner");
5050
const auto behavior_path_lane_change_module_dir =
51-
ament_index_cpp::get_package_share_directory("behavior_path_lane_change_module");
51+
ament_index_cpp::get_package_share_directory("autoware_behavior_path_lane_change_module");
5252

5353
std::vector<std::string> module_names;
5454
module_names.emplace_back(

planning/behavior_path_lane_change_module/CMakeLists.txt planning/autoware_behavior_path_lane_change_module/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(behavior_path_lane_change_module)
2+
project(autoware_behavior_path_lane_change_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/interface.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/interface.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
16-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
1717

18+
#include "autoware_behavior_path_lane_change_module/scene.hpp"
19+
#include "autoware_behavior_path_lane_change_module/utils/base_class.hpp"
20+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
21+
#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
1822
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
1923
#include "autoware_behavior_path_planner_common/turn_signal_decider.hpp"
2024
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
21-
#include "behavior_path_lane_change_module/scene.hpp"
22-
#include "behavior_path_lane_change_module/utils/base_class.hpp"
23-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
24-
#include "behavior_path_lane_change_module/utils/path.hpp"
2525

2626
#include <rclcpp/rclcpp.hpp>
2727

@@ -156,4 +156,4 @@ class LaneChangeInterface : public SceneModuleInterface
156156
};
157157
} // namespace behavior_path_planner
158158

159-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_
159+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__INTERFACE_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/manager.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/manager.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
16-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
1717

18+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
1819
#include "autoware_behavior_path_planner_common/interface/scene_module_manager_interface.hpp"
19-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
2020
#include "route_handler/route_handler.hpp"
2121

2222
#include <rclcpp/rclcpp.hpp>
@@ -75,4 +75,4 @@ class LaneChangeLeftModuleManager : public LaneChangeModuleManager
7575
};
7676
} // namespace behavior_path_planner
7777

78-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_
78+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__MANAGER_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/scene.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/scene.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
15-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
14+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
15+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
1616

17-
#include "behavior_path_lane_change_module/utils/base_class.hpp"
18-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
17+
#include "autoware_behavior_path_lane_change_module/utils/base_class.hpp"
18+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
1919

2020
#include <memory>
2121
#include <utility>
@@ -205,4 +205,4 @@ class NormalLaneChange : public LaneChangeBase
205205
double stop_time_{0.0};
206206
};
207207
} // namespace behavior_path_planner
208-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_
208+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__SCENE_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/base_class.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/base_class.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
15-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
14+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
15+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
1616

17+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
18+
#include "autoware_behavior_path_lane_change_module/utils/debug_structs.hpp"
19+
#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
20+
#include "autoware_behavior_path_lane_change_module/utils/utils.hpp"
1721
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
1822
#include "autoware_behavior_path_planner_common/turn_signal_decider.hpp"
1923
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
20-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
21-
#include "behavior_path_lane_change_module/utils/debug_structs.hpp"
22-
#include "behavior_path_lane_change_module/utils/path.hpp"
23-
#include "behavior_path_lane_change_module/utils/utils.hpp"
2424
#include "tier4_autoware_utils/system/stop_watch.hpp"
2525

2626
#include <magic_enum.hpp>
@@ -239,4 +239,4 @@ class LaneChangeBase
239239
mutable rclcpp::Clock clock_{RCL_ROS_TIME};
240240
};
241241
} // namespace behavior_path_planner
242-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_
242+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__BASE_CLASS_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/data_structs.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/data_structs.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
15-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
14+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
15+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
1616

1717
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp"
1818
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
@@ -226,4 +226,4 @@ struct LanesPolygon
226226
};
227227
} // namespace behavior_path_planner::data::lane_change
228228

229-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_
229+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DATA_STRUCTS_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/debug_structs.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/debug_structs.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
14-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
15-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
14+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
15+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
1616

17-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
18-
#include "behavior_path_lane_change_module/utils/path.hpp"
17+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
18+
#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
1919

2020
#include <autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp>
2121

@@ -73,4 +73,4 @@ struct Debug
7373
};
7474
} // namespace behavior_path_planner::data::lane_change
7575

76-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_
76+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__DEBUG_STRUCTS_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/markers.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/markers.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
16-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
1717

18+
#include "autoware_behavior_path_lane_change_module/utils/debug_structs.hpp"
19+
#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
1820
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp"
19-
#include "behavior_path_lane_change_module/utils/debug_structs.hpp"
20-
#include "behavior_path_lane_change_module/utils/path.hpp"
2121

2222
#include <geometry_msgs/msg/detail/polygon__struct.hpp>
2323
#include <geometry_msgs/msg/detail/pose__struct.hpp>
@@ -48,4 +48,4 @@ MarkerArray createDebugMarkerArray(
4848
const Debug & debug_data, const geometry_msgs::msg::Pose & ego_pose);
4949

5050
} // namespace marker_utils::lane_change_markers
51-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_
51+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__MARKERS_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/path.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/path.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
16-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
1717

18+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
1819
#include "autoware_behavior_path_planner_common/turn_signal_decider.hpp"
1920
#include "autoware_behavior_path_planner_common/utils/path_shifter/path_shifter.hpp"
20-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
2121

2222
#include <tier4_planning_msgs/msg/path_with_lane_id.hpp>
2323

@@ -50,4 +50,4 @@ struct LaneChangeStatus
5050
};
5151

5252
} // namespace behavior_path_planner
53-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_
53+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__PATH_HPP_

planning/behavior_path_lane_change_module/include/behavior_path_lane_change_module/utils/utils.hpp planning/autoware_behavior_path_lane_change_module/include/autoware_behavior_path_lane_change_module/utils/utils.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
16-
#define BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
15+
#ifndef AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
16+
#define AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
1717

18+
#include "autoware_behavior_path_lane_change_module/utils/data_structs.hpp"
19+
#include "autoware_behavior_path_lane_change_module/utils/path.hpp"
1820
#include "autoware_behavior_path_planner_common/parameters.hpp"
1921
#include "autoware_behavior_path_planner_common/utils/path_safety_checker/path_safety_checker_parameters.hpp"
2022
#include "autoware_behavior_path_planner_common/utils/utils.hpp"
21-
#include "behavior_path_lane_change_module/utils/data_structs.hpp"
22-
#include "behavior_path_lane_change_module/utils/path.hpp"
2323
#include "rclcpp/logger.hpp"
2424

2525
#include <route_handler/route_handler.hpp>
@@ -308,4 +308,4 @@ geometry_msgs::msg::Polygon createExecutionArea(
308308
double additional_lon_offset, double additional_lat_offset);
309309
} // namespace behavior_path_planner::utils::lane_change::debug
310310

311-
#endif // BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_
311+
#endif // AUTOWARE_BEHAVIOR_PATH_LANE_CHANGE_MODULE__UTILS__UTILS_HPP_

planning/behavior_path_lane_change_module/package.xml planning/autoware_behavior_path_lane_change_module/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>behavior_path_lane_change_module</name>
4+
<name>autoware_behavior_path_lane_change_module</name>
55
<version>0.1.0</version>
6-
<description>The behavior_path_lane_change_module package</description>
6+
<description>The autoware_behavior_path_lane_change_module package</description>
77

88
<maintainer email="fumiya.watanabe@tier4.jp">Fumiya Watanabe</maintainer>
99
<maintainer email="satoshi.ota@tier4.jp">Satoshi Ota</maintainer>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<library path="autoware_behavior_path_lane_change_module">
2+
<class type="behavior_path_planner::LaneChangeLeftModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
3+
<class type="behavior_path_planner::LaneChangeRightModuleManager" base_class_type="behavior_path_planner::SceneModuleManagerInterface"/>
4+
</library>

planning/behavior_path_lane_change_module/src/interface.cpp planning/autoware_behavior_path_lane_change_module/src/interface.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "behavior_path_lane_change_module/interface.hpp"
15+
#include "autoware_behavior_path_lane_change_module/interface.hpp"
1616

17+
#include "autoware_behavior_path_lane_change_module/utils/markers.hpp"
18+
#include "autoware_behavior_path_lane_change_module/utils/utils.hpp"
1719
#include "autoware_behavior_path_planner_common/interface/scene_module_interface.hpp"
1820
#include "autoware_behavior_path_planner_common/interface/scene_module_visitor.hpp"
1921
#include "autoware_behavior_path_planner_common/marker_utils/utils.hpp"
20-
#include "behavior_path_lane_change_module/utils/markers.hpp"
21-
#include "behavior_path_lane_change_module/utils/utils.hpp"
2222

2323
#include <tier4_autoware_utils/ros/marker_helper.hpp>
2424

0 commit comments

Comments
 (0)