Skip to content

Commit 7011ea1

Browse files
authored
fix(autoware_behavior_path_planner_common): fix unusedFunction (#8654)
* fix:unusedFunction 0-2 Signed-off-by: kobayu858 <yutaro.kobayashi@tier4.jp> * fix:unusedFunction 3-5 Signed-off-by: kobayu858 <yutaro.kobayashi@tier4.jp> * fix:unusedFunction Signed-off-by: kobayu858 <yutaro.kobayashi@tier4.jp> --------- Signed-off-by: kobayu858 <yutaro.kobayashi@tier4.jp>
1 parent cf3ba7f commit 7011ea1

File tree

7 files changed

+4
-349
lines changed

7 files changed

+4
-349
lines changed

planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/utils/path_utils.hpp

-9
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ void clipPathLength(
6767
void clipPathLength(
6868
PathWithLaneId & path, const size_t target_idx, const BehaviorPathPlannerParameters & params);
6969

70-
std::pair<TurnIndicatorsCommand, double> getPathTurnSignal(
71-
const lanelet::ConstLanelets & current_lanes, const ShiftedPath & path,
72-
const ShiftLine & shift_line, const Pose & pose, const double & velocity,
73-
const BehaviorPathPlannerParameters & common_parameter);
74-
7570
PathWithLaneId convertWayPointsToPathWithLaneId(
7671
const autoware::freespace_planning_algorithms::PlannerWaypoints & waypoints,
7772
const double velocity, const lanelet::ConstLanelets & lanelets);
@@ -83,8 +78,6 @@ std::vector<PathWithLaneId> dividePath(
8378

8479
void correctDividedPathVelocity(std::vector<PathWithLaneId> & divided_paths);
8580

86-
bool isCloseToPath(const PathWithLaneId & path, const Pose & pose, const double distance_threshold);
87-
8881
// only two points is supported
8982
std::vector<double> splineTwoPoints(
9083
const std::vector<double> & base_s, const std::vector<double> & base_x, const double begin_diff,
@@ -103,8 +96,6 @@ PathWithLaneId calcCenterLinePath(
10396

10497
PathWithLaneId combinePath(const PathWithLaneId & path1, const PathWithLaneId & path2);
10598

106-
std::optional<Pose> getFirstStopPoseFromPath(const PathWithLaneId & path);
107-
10899
BehaviorModuleOutput getReferencePath(
109100
const lanelet::ConstLanelet & current_lane,
110101
const std::shared_ptr<const PlannerData> & planner_data);

planning/behavior_path_planner/autoware_behavior_path_planner_common/include/autoware/behavior_path_planner_common/utils/utils.hpp

-21
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ FrenetPoint convertToFrenetPoint(
104104
return frenet_point;
105105
}
106106

107-
std::vector<lanelet::Id> getIds(const lanelet::ConstLanelets & lanelets);
108-
109107
// distance (arclength) calculation
110108

111109
double l2Norm(const Vector3 vector);
@@ -126,14 +124,6 @@ double getArcLengthToTargetLanelet(
126124
const lanelet::ConstLanelets & current_lanes, const lanelet::ConstLanelet & target_lane,
127125
const Pose & pose);
128126

129-
double getDistanceBetweenPredictedPaths(
130-
const PredictedPath & path1, const PredictedPath & path2, const double start_time,
131-
const double end_time, const double resolution);
132-
133-
double getDistanceBetweenPredictedPathAndObject(
134-
const PredictedObject & object, const PredictedPath & path, const double start_time,
135-
const double end_time, const double resolution);
136-
137127
/**
138128
* @brief Check collision between ego path footprints with extra longitudinal stopping margin and
139129
* objects.
@@ -223,8 +213,6 @@ PathWithLaneId refinePathForGoal(
223213
const double search_radius_range, const double search_rad_range, const PathWithLaneId & input,
224214
const Pose & goal, const int64_t goal_lane_id);
225215

226-
bool containsGoal(const lanelet::ConstLanelets & lanes, const lanelet::Id & goal_id);
227-
228216
bool isAllowedGoalModification(const std::shared_ptr<RouteHandler> & route_handler);
229217
bool checkOriginalGoalIsInShoulder(const std::shared_ptr<RouteHandler> & route_handler);
230218

@@ -269,10 +257,6 @@ Polygon2d toPolygon2d(const lanelet::ConstLanelet & lanelet);
269257

270258
Polygon2d toPolygon2d(const lanelet::BasicPolygon2d & polygon);
271259

272-
std::vector<Polygon2d> getTargetLaneletPolygons(
273-
const lanelet::ConstLanelets & lanelets, const Pose & pose, const double check_length,
274-
const std::string & target_type);
275-
276260
PathWithLaneId getCenterLinePathFromLanelet(
277261
const lanelet::ConstLanelet & current_route_lanelet,
278262
const std::shared_ptr<const PlannerData> & planner_data);
@@ -283,11 +267,6 @@ PathWithLaneId getCenterLinePath(
283267
const Pose & pose, const double backward_path_length, const double forward_path_length,
284268
const BehaviorPathPlannerParameters & parameter);
285269

286-
PathWithLaneId setDecelerationVelocity(
287-
const RouteHandler & route_handler, const PathWithLaneId & input,
288-
const lanelet::ConstLanelets & lanelet_sequence, const double lane_change_prepare_duration,
289-
const double lane_change_buffer);
290-
291270
// object label
292271
std::uint8_t getHighestProbLabel(const std::vector<ObjectClassification> & classification);
293272

planning/behavior_path_planner/autoware_behavior_path_planner_common/src/marker_utils/utils.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,7 @@ MarkerArray createObjectsMarkerArray(
341341
return msg;
342342
}
343343

344+
// cppcheck-suppress unusedFunction
344345
MarkerArray createDrivableLanesMarkerArray(
345346
const std::vector<DrivableLanes> & drivable_lanes, std::string && ns)
346347
{

planning/behavior_path_planner/autoware_behavior_path_planner_common/src/utils/drivable_area_expansion/static_drivable_area.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -622,20 +622,6 @@ std::vector<Point> updateBoundary(
622622
return updated_bound;
623623
}
624624

625-
[[maybe_unused]] geometry_msgs::msg::Point calcCenterOfGeometry(const Polygon2d & obj_poly)
626-
{
627-
geometry_msgs::msg::Point center_pos;
628-
for (const auto & point : obj_poly.outer()) {
629-
center_pos.x += point.x();
630-
center_pos.y += point.y();
631-
}
632-
633-
center_pos.x = center_pos.x / obj_poly.outer().size();
634-
center_pos.y = center_pos.y / obj_poly.outer().size();
635-
center_pos.z = center_pos.z / obj_poly.outer().size();
636-
637-
return center_pos;
638-
}
639625
} // namespace autoware::behavior_path_planner::utils::drivable_area_processing
640626

641627
namespace autoware::behavior_path_planner::utils

planning/behavior_path_planner/autoware_behavior_path_planner_common/src/utils/parking_departure/utils.cpp

-10
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,6 @@ void initializeCollisionCheckDebugMap(CollisionCheckDebugMap & collision_check_d
104104
collision_check_debug_map.clear();
105105
}
106106

107-
void updateSafetyCheckTargetObjectsData(
108-
StartGoalPlannerData & data, const PredictedObjects & filtered_objects,
109-
const TargetObjectsOnLane & target_objects_on_lane,
110-
const std::vector<PoseWithVelocityStamped> & ego_predicted_path)
111-
{
112-
data.filtered_objects = filtered_objects;
113-
data.target_objects_on_lane = target_objects_on_lane;
114-
data.ego_predicted_path = ego_predicted_path;
115-
}
116-
117107
std::pair<double, double> getPairsTerminalVelocityAndAccel(
118108
const std::vector<std::pair<double, double>> & pairs_terminal_velocity_and_accel,
119109
const size_t current_path_idx)

planning/behavior_path_planner/autoware_behavior_path_planner_common/src/utils/path_utils.cpp

-143
Original file line numberDiff line numberDiff line change
@@ -209,127 +209,6 @@ void clipPathLength(
209209
clipPathLength(path, target_idx, params.forward_path_length, params.backward_path_length);
210210
}
211211

212-
std::pair<TurnIndicatorsCommand, double> getPathTurnSignal(
213-
const lanelet::ConstLanelets & current_lanes, const ShiftedPath & path,
214-
const ShiftLine & shift_line, const Pose & pose, const double & velocity,
215-
const BehaviorPathPlannerParameters & common_parameter)
216-
{
217-
TurnIndicatorsCommand turn_signal;
218-
turn_signal.command = TurnIndicatorsCommand::NO_COMMAND;
219-
const double max_time = std::numeric_limits<double>::max();
220-
const double max_distance = std::numeric_limits<double>::max();
221-
if (path.shift_length.size() < shift_line.end_idx + 1) {
222-
return std::make_pair(turn_signal, max_distance);
223-
}
224-
const auto base_link2front = common_parameter.base_link2front;
225-
const auto vehicle_width = common_parameter.vehicle_width;
226-
const auto shift_to_outside = vehicle_width / 2;
227-
const auto turn_signal_shift_length_threshold =
228-
common_parameter.turn_signal_shift_length_threshold;
229-
const auto turn_signal_minimum_search_distance =
230-
common_parameter.turn_signal_minimum_search_distance;
231-
const auto turn_signal_search_time = common_parameter.turn_signal_search_time;
232-
constexpr double epsilon = 1e-6;
233-
const auto arc_position_current_pose = lanelet::utils::getArcCoordinates(current_lanes, pose);
234-
235-
// Start turn signal when 1 or 2 is satisfied
236-
// 1. time to shift start point is less than prev_sec
237-
// 2. distance to shift point is shorter than tl_on_threshold_long
238-
239-
// Turn signal on when conditions below are satisfied
240-
// 1. lateral offset is larger than tl_on_threshold_lat for left signal
241-
// smaller than tl_on_threshold_lat for right signal
242-
// 2. side point at shift start/end point cross the line
243-
const double distance_to_shift_start =
244-
std::invoke([&current_lanes, &shift_line, &arc_position_current_pose]() {
245-
const auto arc_position_shift_start =
246-
lanelet::utils::getArcCoordinates(current_lanes, shift_line.start);
247-
return arc_position_shift_start.length - arc_position_current_pose.length;
248-
});
249-
250-
const auto time_to_shift_start =
251-
(std::abs(velocity) < epsilon) ? max_time : distance_to_shift_start / velocity;
252-
253-
const double diff =
254-
path.shift_length.at(shift_line.end_idx) - path.shift_length.at(shift_line.start_idx);
255-
256-
Pose shift_start_point = path.path.points.at(shift_line.start_idx).point.pose;
257-
Pose shift_end_point = path.path.points.at(shift_line.end_idx).point.pose;
258-
Pose left_start_point = shift_start_point;
259-
Pose right_start_point = shift_start_point;
260-
Pose left_end_point = shift_end_point;
261-
Pose right_end_point = shift_end_point;
262-
{
263-
const double start_yaw = tf2::getYaw(shift_line.start.orientation);
264-
const double end_yaw = tf2::getYaw(shift_line.end.orientation);
265-
left_start_point.position.x -= std::sin(start_yaw) * (shift_to_outside);
266-
left_start_point.position.y += std::cos(start_yaw) * (shift_to_outside);
267-
right_start_point.position.x -= std::sin(start_yaw) * (-shift_to_outside);
268-
right_start_point.position.y += std::cos(start_yaw) * (-shift_to_outside);
269-
left_end_point.position.x -= std::sin(end_yaw) * (shift_to_outside);
270-
left_end_point.position.y += std::cos(end_yaw) * (shift_to_outside);
271-
right_end_point.position.x -= std::sin(end_yaw) * (-shift_to_outside);
272-
right_end_point.position.y += std::cos(end_yaw) * (-shift_to_outside);
273-
}
274-
275-
bool left_start_point_is_in_lane = false;
276-
bool right_start_point_is_in_lane = false;
277-
bool left_end_point_is_in_lane = false;
278-
bool right_end_point_is_in_lane = false;
279-
{
280-
for (const auto & llt : current_lanes) {
281-
if (lanelet::utils::isInLanelet(left_start_point, llt, 0.1)) {
282-
left_start_point_is_in_lane = true;
283-
}
284-
if (lanelet::utils::isInLanelet(right_start_point, llt, 0.1)) {
285-
right_start_point_is_in_lane = true;
286-
}
287-
if (lanelet::utils::isInLanelet(left_end_point, llt, 0.1)) {
288-
left_end_point_is_in_lane = true;
289-
}
290-
if (lanelet::utils::isInLanelet(right_end_point, llt, 0.1)) {
291-
right_end_point_is_in_lane = true;
292-
}
293-
}
294-
}
295-
296-
const bool cross_line = std::invoke([&]() {
297-
constexpr bool temporary_set_cross_line_true =
298-
true; // due to a bug. See link:
299-
// https://github.com/autowarefoundation/autoware.universe/pull/748
300-
if (temporary_set_cross_line_true) {
301-
return true;
302-
}
303-
return (
304-
left_start_point_is_in_lane != left_end_point_is_in_lane ||
305-
right_start_point_is_in_lane != right_end_point_is_in_lane);
306-
});
307-
308-
if (
309-
time_to_shift_start < turn_signal_search_time ||
310-
distance_to_shift_start < turn_signal_minimum_search_distance) {
311-
if (diff > turn_signal_shift_length_threshold && cross_line) {
312-
turn_signal.command = TurnIndicatorsCommand::ENABLE_LEFT;
313-
} else if (diff < -turn_signal_shift_length_threshold && cross_line) {
314-
turn_signal.command = TurnIndicatorsCommand::ENABLE_RIGHT;
315-
}
316-
}
317-
318-
// calc distance from ego vehicle front to shift end point.
319-
const double distance_from_vehicle_front =
320-
std::invoke([&current_lanes, &shift_line, &arc_position_current_pose, &base_link2front]() {
321-
const auto arc_position_shift_end =
322-
lanelet::utils::getArcCoordinates(current_lanes, shift_line.end);
323-
return arc_position_shift_end.length - arc_position_current_pose.length - base_link2front;
324-
});
325-
326-
if (distance_from_vehicle_front >= 0.0) {
327-
return std::make_pair(turn_signal, distance_from_vehicle_front);
328-
}
329-
330-
return std::make_pair(turn_signal, max_distance);
331-
}
332-
333212
PathWithLaneId convertWayPointsToPathWithLaneId(
334213
const autoware::freespace_planning_algorithms::PlannerWaypoints & waypoints,
335214
const double velocity, const lanelet::ConstLanelets & lanelets)
@@ -431,18 +310,6 @@ void correctDividedPathVelocity(std::vector<PathWithLaneId> & divided_paths)
431310
}
432311
}
433312

434-
bool isCloseToPath(const PathWithLaneId & path, const Pose & pose, const double distance_threshold)
435-
{
436-
for (const auto & point : path.points) {
437-
const auto & p = point.point.pose.position;
438-
const double dist = std::hypot(pose.position.x - p.x, pose.position.y - p.y);
439-
if (dist < distance_threshold) {
440-
return true;
441-
}
442-
}
443-
return false;
444-
}
445-
446313
// only two points is supported
447314
std::vector<double> splineTwoPoints(
448315
const std::vector<double> & base_s, const std::vector<double> & base_x, const double begin_diff,
@@ -579,16 +446,6 @@ PathWithLaneId combinePath(const PathWithLaneId & path1, const PathWithLaneId &
579446
return filtered_path;
580447
}
581448

582-
std::optional<Pose> getFirstStopPoseFromPath(const PathWithLaneId & path)
583-
{
584-
for (const auto & p : path.points) {
585-
if (std::abs(p.point.longitudinal_velocity_mps) < 0.01) {
586-
return p.point.pose;
587-
}
588-
}
589-
return std::nullopt;
590-
}
591-
592449
BehaviorModuleOutput getReferencePath(
593450
const lanelet::ConstLanelet & current_lane,
594451
const std::shared_ptr<const PlannerData> & planner_data)

0 commit comments

Comments
 (0)