Skip to content

Commit e6335f1

Browse files
committed
add autoware_ prefix to package names
Signed-off-by: Maxime CLEMENT <maxime.clement@tier4.jp>
1 parent 1749d66 commit e6335f1

Some content is hidden

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

48 files changed

+98
-95
lines changed

launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<arg name="motion_velocity_planner_launch_modules" default="["/>
1111
<let
1212
name="motion_velocity_planner_launch_modules"
13-
value="$(eval &quot;'$(var motion_velocity_planner_launch_modules)' + 'motion_velocity_planner::OutOfLaneModule, '&quot;)"
13+
value="$(eval &quot;'$(var motion_velocity_planner_launch_modules)' + 'autoware::motion_velocity_planner::OutOfLaneModule, '&quot;)"
1414
if="$(var launch_motion_out_of_lane_module)"
1515
/>
1616
<let
@@ -112,7 +112,7 @@
112112
<!-- plan slowdown or stops on the final trajectory -->
113113
<group>
114114
<load_composable_node target="/planning/scenario_planning/lane_driving/motion_planning/motion_planning_container">
115-
<composable_node pkg="motion_velocity_planner_node" plugin="motion_velocity_planner::MotionVelocityPlannerNode" name="motion_velocity_planner" namespace="">
115+
<composable_node pkg="autoware_motion_velocity_planner_node" plugin="autoware::motion_velocity_planner::MotionVelocityPlannerNode" name="motion_velocity_planner" namespace="">
116116
<!-- topic remap -->
117117
<remap from="~/input/trajectory" to="obstacle_avoidance_planner/trajectory"/>
118118
<remap from="~/input/vector_map" to="/map/vector_map"/>

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/CMakeLists.txt planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(motion_velocity_out_of_lane_module)
2+
project(autoware_motion_velocity_out_of_lane_module)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
6-
pluginlib_export_plugin_description_file(motion_velocity_planner_node plugins.xml)
6+
pluginlib_export_plugin_description_file(autoware_motion_velocity_planner_node plugins.xml)
77

88
ament_auto_add_library(${PROJECT_NAME} SHARED
99
DIRECTORY src

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/package.xml planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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>motion_velocity_out_of_lane_module</name>
4+
<name>autoware_motion_velocity_out_of_lane_module</name>
55
<version>0.1.0</version>
66
<description>The motion_velocity_out_of_lane_module package</description>
77

@@ -16,11 +16,11 @@
1616
<buildtool_depend>autoware_cmake</buildtool_depend>
1717
<depend>autoware_auto_perception_msgs</depend>
1818
<depend>autoware_auto_planning_msgs</depend>
19+
<depend>autoware_motion_velocity_planner_common</depend>
1920
<depend>geometry_msgs</depend>
2021
<depend>lanelet2_extension</depend>
2122
<depend>libboost-dev</depend>
2223
<depend>motion_utils</depend>
23-
<depend>motion_velocity_planner_common</depend>
2424
<depend>pluginlib</depend>
2525
<depend>rclcpp</depend>
2626
<depend>route_handler</depend>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<library path="autoware_motion_velocity_out_of_lane_module">
2+
<class type="autoware::motion_velocity_planner::OutOfLaneModule" base_class_type="autoware::motion_velocity_planner::PluginModuleInterface"/>
3+
</library>

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/calculate_slowdown_points.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/calculate_slowdown_points.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <lanelet2_core/geometry/Polygon.h>
2525

26-
namespace motion_velocity_planner::out_of_lane
26+
namespace autoware::motion_velocity_planner::out_of_lane
2727
{
2828

2929
bool can_decelerate(
@@ -82,4 +82,4 @@ std::optional<SlowdownToInsert> calculate_slowdown_point(
8282
}
8383
return std::nullopt;
8484
}
85-
} // namespace motion_velocity_planner::out_of_lane
85+
} // namespace autoware::motion_velocity_planner::out_of_lane

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/calculate_slowdown_points.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/calculate_slowdown_points.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <optional>
2323
#include <vector>
2424

25-
namespace motion_velocity_planner::out_of_lane
25+
namespace autoware::motion_velocity_planner::out_of_lane
2626
{
2727

2828
/// @brief estimate whether ego can decelerate without breaking the deceleration limit
@@ -54,5 +54,5 @@ std::optional<TrajectoryPoint> calculate_last_in_lane_pose(
5454
std::optional<SlowdownToInsert> calculate_slowdown_point(
5555
const EgoData & ego_data, const std::vector<Slowdown> & decisions,
5656
const std::optional<SlowdownToInsert> prev_slowdown_point, PlannerParam params);
57-
} // namespace motion_velocity_planner::out_of_lane
57+
} // namespace autoware::motion_velocity_planner::out_of_lane
5858
#endif // CALCULATE_SLOWDOWN_POINTS_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/debug.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/debug.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <string>
2424
#include <vector>
2525

26-
namespace motion_velocity_planner::out_of_lane::debug
26+
namespace autoware::motion_velocity_planner::out_of_lane::debug
2727
{
2828
namespace
2929
{
@@ -239,4 +239,4 @@ motion_utils::VirtualWalls create_virtual_walls(
239239
}
240240
return virtual_walls;
241241
}
242-
} // namespace motion_velocity_planner::out_of_lane::debug
242+
} // namespace autoware::motion_velocity_planner::out_of_lane::debug

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/debug.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/debug.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121

2222
#include <visualization_msgs/msg/marker_array.hpp>
2323

24-
namespace motion_velocity_planner::out_of_lane::debug
24+
namespace autoware::motion_velocity_planner::out_of_lane::debug
2525
{
2626
visualization_msgs::msg::MarkerArray create_debug_marker_array(const DebugData & debug_data);
2727
motion_utils::VirtualWalls create_virtual_walls(
2828
const DebugData & debug_data, const PlannerParam & params);
29-
} // namespace motion_velocity_planner::out_of_lane::debug
29+
} // namespace autoware::motion_velocity_planner::out_of_lane::debug
3030

3131
#endif // DEBUG_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/decisions.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/decisions.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <memory>
3030
#include <utility>
3131
#include <vector>
32-
namespace motion_velocity_planner::out_of_lane
32+
namespace autoware::motion_velocity_planner::out_of_lane
3333
{
3434
double distance_along_trajectory(const EgoData & ego_data, const size_t target_idx)
3535
{
@@ -385,4 +385,4 @@ std::vector<Slowdown> calculate_decisions(
385385
return decisions;
386386
}
387387

388-
} // namespace motion_velocity_planner::out_of_lane
388+
} // namespace autoware::motion_velocity_planner::out_of_lane

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/decisions.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/decisions.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <utility>
3030
#include <vector>
3131

32-
namespace motion_velocity_planner::out_of_lane
32+
namespace autoware::motion_velocity_planner::out_of_lane
3333
{
3434
/// @brief calculate the distance along the ego trajectory between ego and some target trajectory
3535
/// index
@@ -111,6 +111,6 @@ std::optional<Slowdown> calculate_decision(
111111
/// @return return the calculated decisions to slowdown or stop
112112
std::vector<Slowdown> calculate_decisions(
113113
const DecisionInputs & inputs, const PlannerParam & params, const rclcpp::Logger & logger);
114-
} // namespace motion_velocity_planner::out_of_lane
114+
} // namespace autoware::motion_velocity_planner::out_of_lane
115115

116116
#endif // DECISIONS_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/filter_predicted_objects.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/filter_predicted_objects.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <algorithm>
2626

27-
namespace motion_velocity_planner::out_of_lane
27+
namespace autoware::motion_velocity_planner::out_of_lane
2828
{
2929
void cut_predicted_path_beyond_line(
3030
autoware_auto_perception_msgs::msg::PredictedPath & predicted_path,
@@ -145,4 +145,4 @@ autoware_auto_perception_msgs::msg::PredictedObjects filter_predicted_objects(
145145
return filtered_objects;
146146
}
147147

148-
} // namespace motion_velocity_planner::out_of_lane
148+
} // namespace autoware::motion_velocity_planner::out_of_lane

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/filter_predicted_objects.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/filter_predicted_objects.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717

1818
#include "types.hpp"
1919

20-
#include <motion_velocity_planner_common/planner_data.hpp>
20+
#include <autoware_motion_velocity_planner_common/planner_data.hpp>
2121

2222
#include <memory>
2323
#include <optional>
2424

25-
namespace motion_velocity_planner::out_of_lane
25+
namespace autoware::motion_velocity_planner::out_of_lane
2626
{
2727
/// @brief cut a predicted path beyond the given stop line
2828
/// @param [inout] predicted_path predicted path to cut
@@ -55,6 +55,6 @@ void cut_predicted_path_beyond_red_lights(
5555
autoware_auto_perception_msgs::msg::PredictedObjects filter_predicted_objects(
5656
const std::shared_ptr<const PlannerData> planner_data, const EgoData & ego_data,
5757
const PlannerParam & params);
58-
} // namespace motion_velocity_planner::out_of_lane
58+
} // namespace autoware::motion_velocity_planner::out_of_lane
5959

6060
#endif // FILTER_PREDICTED_OBJECTS_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/footprint.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/footprint.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <algorithm>
2525
#include <vector>
2626

27-
namespace motion_velocity_planner::out_of_lane
27+
namespace autoware::motion_velocity_planner::out_of_lane
2828
{
2929
tier4_autoware_utils::Polygon2d make_base_footprint(
3030
const PlannerParam & p, const bool ignore_offset)
@@ -90,4 +90,4 @@ lanelet::BasicPolygon2d calculate_current_ego_footprint(
9090
footprint.emplace_back(p.x() + ego_data.pose.position.x, p.y() + ego_data.pose.position.y);
9191
return footprint;
9292
}
93-
} // namespace motion_velocity_planner::out_of_lane
93+
} // namespace autoware::motion_velocity_planner::out_of_lane

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/footprint.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/footprint.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <vector>
2323

24-
namespace motion_velocity_planner
24+
namespace autoware::motion_velocity_planner
2525
{
2626
namespace out_of_lane
2727
{
@@ -54,6 +54,6 @@ std::vector<lanelet::BasicPolygon2d> calculate_trajectory_footprints(
5454
lanelet::BasicPolygon2d calculate_current_ego_footprint(
5555
const EgoData & ego_data, const PlannerParam & params, const bool ignore_offset = false);
5656
} // namespace out_of_lane
57-
} // namespace motion_velocity_planner
57+
} // namespace autoware::motion_velocity_planner
5858

5959
#endif // FOOTPRINT_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/lanelets_selection.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/lanelets_selection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <algorithm>
2323
#include <string>
2424

25-
namespace motion_velocity_planner::out_of_lane
25+
namespace autoware::motion_velocity_planner::out_of_lane
2626
{
2727

2828
lanelet::ConstLanelets consecutive_lanelets(
@@ -123,4 +123,4 @@ lanelet::ConstLanelets calculate_other_lanelets(
123123
}
124124
return other_lanelets;
125125
}
126-
} // namespace motion_velocity_planner::out_of_lane
126+
} // namespace autoware::motion_velocity_planner::out_of_lane

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/lanelets_selection.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/lanelets_selection.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <memory>
2525

26-
namespace motion_velocity_planner::out_of_lane
26+
namespace autoware::motion_velocity_planner::out_of_lane
2727
{
2828
/// @brief checks if a lanelet is already contained in a vector of lanelets
2929
/// @param [in] lanelets vector to check
@@ -75,6 +75,6 @@ lanelet::ConstLanelets calculate_other_lanelets(
7575
const lanelet::ConstLanelets & ignored_lanelets,
7676
const std::shared_ptr<const route_handler::RouteHandler> route_handler,
7777
const PlannerParam & params);
78-
} // namespace motion_velocity_planner::out_of_lane
78+
} // namespace autoware::motion_velocity_planner::out_of_lane
7979

8080
#endif // LANELETS_SELECTION_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/out_of_lane_module.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/out_of_lane_module.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <utility>
3939
#include <vector>
4040

41-
namespace motion_velocity_planner
41+
namespace autoware::motion_velocity_planner
4242
{
4343

4444
using visualization_msgs::msg::Marker;
@@ -297,8 +297,9 @@ VelocityPlanningResult OutOfLaneModule::plan(
297297
return result;
298298
}
299299

300-
} // namespace motion_velocity_planner
300+
} // namespace autoware::motion_velocity_planner
301301

302302
#include <pluginlib/class_list_macros.hpp>
303303
PLUGINLIB_EXPORT_CLASS(
304-
motion_velocity_planner::OutOfLaneModule, motion_velocity_planner::PluginModuleInterface)
304+
autoware::motion_velocity_planner::OutOfLaneModule,
305+
autoware::motion_velocity_planner::PluginModuleInterface)

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/out_of_lane_module.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/out_of_lane_module.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
#include "types.hpp"
1919

20+
#include <autoware_motion_velocity_planner_common/plugin_module_interface.hpp>
21+
#include <autoware_motion_velocity_planner_common/velocity_planning_result.hpp>
2022
#include <motion_utils/marker/virtual_wall_marker_creator.hpp>
21-
#include <motion_velocity_planner_common/plugin_module_interface.hpp>
22-
#include <motion_velocity_planner_common/velocity_planning_result.hpp>
2323
#include <rclcpp/rclcpp.hpp>
2424

2525
#include <autoware_auto_perception_msgs/msg/predicted_objects.hpp>
@@ -32,7 +32,7 @@
3232
#include <string>
3333
#include <vector>
3434

35-
namespace motion_velocity_planner
35+
namespace autoware::motion_velocity_planner
3636
{
3737
class OutOfLaneModule : public PluginModuleInterface
3838
{
@@ -58,6 +58,6 @@ class OutOfLaneModule : public PluginModuleInterface
5858
// Debug
5959
mutable out_of_lane::DebugData debug_data_;
6060
};
61-
} // namespace motion_velocity_planner
61+
} // namespace autoware::motion_velocity_planner
6262

6363
#endif // OUT_OF_LANE_MODULE_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/overlapping_range.cpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/overlapping_range.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <algorithm>
2626

27-
namespace motion_velocity_planner::out_of_lane
27+
namespace autoware::motion_velocity_planner::out_of_lane
2828
{
2929

3030
Overlap calculate_overlap(
@@ -124,4 +124,4 @@ OverlapRanges calculate_overlapping_ranges(
124124
return ranges;
125125
}
126126

127-
} // namespace motion_velocity_planner::out_of_lane
127+
} // namespace autoware::motion_velocity_planner::out_of_lane

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/overlapping_range.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/overlapping_range.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <vector>
2525

26-
namespace motion_velocity_planner::out_of_lane
26+
namespace autoware::motion_velocity_planner::out_of_lane
2727
{
2828

2929
/// @brief calculate the overlap between the given footprint and lanelet
@@ -58,6 +58,6 @@ OverlapRanges calculate_overlapping_ranges(
5858
const std::vector<lanelet::BasicPolygon2d> & trajectory_footprints,
5959
const lanelet::ConstLanelets & trajectory_lanelets, const lanelet::ConstLanelets & lanelets,
6060
const PlannerParam & params);
61-
} // namespace motion_velocity_planner::out_of_lane
61+
} // namespace autoware::motion_velocity_planner::out_of_lane
6262

6363
#endif // OVERLAPPING_RANGE_HPP_

planning/motion_velocity_planner/motion_velocity_out_of_lane_module/src/types.hpp planning/motion_velocity_planner/autoware_motion_velocity_out_of_lane_module/src/types.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <utility>
3333
#include <vector>
3434

35-
namespace motion_velocity_planner::out_of_lane
35+
namespace autoware::motion_velocity_planner::out_of_lane
3636
{
3737
using autoware_auto_planning_msgs::msg::TrajectoryPoint;
3838

@@ -231,6 +231,6 @@ struct DebugData
231231
}
232232
};
233233

234-
} // namespace motion_velocity_planner::out_of_lane
234+
} // namespace autoware::motion_velocity_planner::out_of_lane
235235

236236
#endif // TYPES_HPP_

planning/motion_velocity_planner/motion_velocity_planner_common/CMakeLists.txt planning/motion_velocity_planner/autoware_motion_velocity_planner_common/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(motion_velocity_planner_common)
2+
project(autoware_motion_velocity_planner_common)
33

44
find_package(autoware_cmake REQUIRED)
55

planning/motion_velocity_planner/motion_velocity_planner_common/include/motion_velocity_planner_common/planner_data.hpp planning/motion_velocity_planner/autoware_motion_velocity_planner_common/include/autoware_motion_velocity_planner_common/planner_data.hpp

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

15-
#ifndef MOTION_VELOCITY_PLANNER_COMMON__PLANNER_DATA_HPP_
16-
#define MOTION_VELOCITY_PLANNER_COMMON__PLANNER_DATA_HPP_
15+
#ifndef AUTOWARE_MOTION_VELOCITY_PLANNER_COMMON__PLANNER_DATA_HPP_
16+
#define AUTOWARE_MOTION_VELOCITY_PLANNER_COMMON__PLANNER_DATA_HPP_
1717

1818
#include <motion_velocity_smoother/smoother/smoother_base.hpp>
1919
#include <route_handler/route_handler.hpp>
@@ -45,7 +45,7 @@
4545
#include <optional>
4646
#include <vector>
4747

48-
namespace motion_velocity_planner
48+
namespace autoware::motion_velocity_planner
4949
{
5050
struct TrafficSignalStamped
5151
{
@@ -108,6 +108,6 @@ struct PlannerData
108108
return std::make_optional<TrafficSignalStamped>(traffic_light_id_map.at(id));
109109
}
110110
};
111-
} // namespace motion_velocity_planner
111+
} // namespace autoware::motion_velocity_planner
112112

113-
#endif // MOTION_VELOCITY_PLANNER_COMMON__PLANNER_DATA_HPP_
113+
#endif // AUTOWARE_MOTION_VELOCITY_PLANNER_COMMON__PLANNER_DATA_HPP_

0 commit comments

Comments
 (0)