Skip to content

Commit

Permalink
Merge pull request #1519 from tier4/hotfix/beta/v0.34_goal_planner
Browse files Browse the repository at this point in the history
fix(goal planner): fix scenario fail and data race beta/v0.34
  • Loading branch information
shmpwk authored Sep 6, 2024
2 parents 96ff1bd + a7c1dc2 commit 0dc6d82
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1243,8 +1243,6 @@ bool GoalPlannerModule::hasNotDecidedPath(
const std::shared_ptr<SafetyCheckParams> & safety_check_params,
const std::shared_ptr<GoalSearcherBase> goal_searcher) const
{
universe_utils::ScopedTimeTrack st(__func__, *time_keeper_);

return checkDecidingPathStatus(
planner_data, occupancy_grid_map, parameters, ego_predicted_path_params,
objects_filtering_params, safety_check_params, goal_searcher)
Expand Down Expand Up @@ -2360,8 +2358,6 @@ std::pair<bool, bool> GoalPlannerModule::isSafePath(
const std::shared_ptr<ObjectsFilteringParams> & objects_filtering_params,
const std::shared_ptr<SafetyCheckParams> & safety_check_params) const
{
universe_utils::ScopedTimeTrack st(__func__, *time_keeper_);

if (!thread_safe_data_.get_pull_over_path()) {
return {false, false};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ std::optional<Polygon2d> generateObjectExtractionPolygon(
constexpr double INTERSECTION_CHECK_DISTANCE = 10.0;
std::vector<Point> modified_bound{};
size_t i = 0;
while (i < bound.size() - 2) {
while (i < bound.size() - 1) {
BoostPoint p1(bound.at(i).x, bound.at(i).y);
BoostPoint p2(bound.at(i + 1).x, bound.at(i + 1).y);
LineString p_line{};
Expand Down

0 comments on commit 0dc6d82

Please sign in to comment.