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.

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

feat: update start goal planner v0.10.2 #905

Merged
merged 14 commits into from
Oct 3, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
perf(goal_planner): speed up goal candidates update (autowarefoundati…
…on#5114)

* perf(goal_planner): speed up goal candidates update

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

typo

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

* fix(goal_planner): fix goal searcher dying in free space

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>

---------

Signed-off-by: kosuke55 <kosuke.tnp@gmail.com>
  • Loading branch information
kosuke55 committed Oct 3, 2023
commit beff5747e1c12208958aae196a97a3979fa5fcc2
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class GoalSearcher : public GoalSearcherBase

private:
void createAreaPolygons(std::vector<Pose> original_search_poses);
bool checkCollision(const Pose & pose) const;
bool checkCollision(const Pose & pose, const PredictedObjects & dynamic_objects) const;
bool checkCollisionWithLongitudinalDistance(
const Pose & ego_pose, const PredictedObjects & dynamic_objects) const;
BasicPolygons2d getNoParkingAreaPolygons(const lanelet::ConstLanelets & lanes) const;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,25 +177,25 @@ GoalCandidates GoalSearcher::search(const Pose & original_goal_pose)

void GoalSearcher::update(GoalCandidates & goal_candidates) const
{
const auto stop_objects = utils::path_safety_checker::filterObjectsByVelocity(
*(planner_data_->dynamic_object), parameters_.th_moving_object_velocity);
const auto pull_over_lanes = goal_planner_utils::getPullOverLanes(
*(planner_data_->route_handler), left_side_parking_, parameters_.backward_goal_search_length,
parameters_.forward_goal_search_length);
const auto [pull_over_lane_stop_objects, others] =
utils::path_safety_checker::separateObjectsByLanelets(stop_objects, pull_over_lanes);

// update is_safe
for (auto & goal_candidate : goal_candidates) {
const Pose goal_pose = goal_candidate.goal_pose;

// check collision with footprint
if (checkCollision(goal_pose)) {
if (checkCollision(goal_pose, pull_over_lane_stop_objects)) {
goal_candidate.is_safe = false;
continue;
}

// check longitudinal margin with pull over lane objects
const auto pull_over_lanes = goal_planner_utils::getPullOverLanes(
*(planner_data_->route_handler), left_side_parking_, parameters_.backward_goal_search_length,
parameters_.forward_goal_search_length);
const auto [pull_over_lane_objects, others] =
utils::path_safety_checker::separateObjectsByLanelets(
*(planner_data_->dynamic_object), pull_over_lanes);
const auto pull_over_lane_stop_objects = utils::path_safety_checker::filterObjectsByVelocity(
pull_over_lane_objects, parameters_.th_moving_object_velocity);
constexpr bool filter_inside = true;
const auto target_objects = goal_planner_utils::filterObjectsByLateralDistance(
goal_pose, planner_data_->parameters.vehicle_width, pull_over_lane_stop_objects,
Expand All @@ -209,7 +209,7 @@ void GoalSearcher::update(GoalCandidates & goal_candidates) const
}
}

bool GoalSearcher::checkCollision(const Pose & pose) const
bool GoalSearcher::checkCollision(const Pose & pose, const PredictedObjects & dynamic_objects) const
{
if (parameters_.use_occupancy_grid_for_goal_search) {
const Pose pose_grid_coords = global2local(occupancy_grid_map_->getMap(), pose);
Expand All @@ -222,16 +222,8 @@ bool GoalSearcher::checkCollision(const Pose & pose) const
}

if (parameters_.use_object_recognition) {
const auto pull_over_lanes = goal_planner_utils::getPullOverLanes(
*(planner_data_->route_handler), left_side_parking_, parameters_.backward_goal_search_length,
parameters_.forward_goal_search_length);
const auto [pull_over_lane_objects, others] =
utils::path_safety_checker::separateObjectsByLanelets(
*(planner_data_->dynamic_object), pull_over_lanes);
const auto pull_over_lane_stop_objects = utils::path_safety_checker::filterObjectsByVelocity(
pull_over_lane_objects, parameters_.th_moving_object_velocity);
if (utils::checkCollisionBetweenFootprintAndObjects(
vehicle_footprint_, pose, pull_over_lane_stop_objects,
vehicle_footprint_, pose, dynamic_objects,
parameters_.object_recognition_collision_check_margin)) {
return true;
}
Expand Down