Skip to content

Commit

Permalink
rename planPullOver
Browse files Browse the repository at this point in the history
Signed-off-by: kosuke55 <[email protected]>
  • Loading branch information
kosuke55 committed Nov 13, 2023
1 parent 56c244e commit d90a5c1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -391,8 +391,8 @@ class GoalPlannerModule : public SceneModuleInterface
bool canReturnToLaneParking();

// plan pull over path
BehaviorModuleOutput planRunning();
BehaviorModuleOutput planPullOver();
BehaviorModuleOutput planPullOverAsOutput();
BehaviorModuleOutput planPullOverAsCandidate();
std::optional<std::pair<PullOverPath, GoalCandidate>> selectPullOverPath(
const std::vector<PullOverPath> & pull_over_path_candidates,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ GoalCandidates GoalPlannerModule::generateGoalCandidates() const
BehaviorModuleOutput GoalPlannerModule::plan()
{
if (goal_planner_utils::isAllowedGoalModification(planner_data_->route_handler)) {
return planRunning();
return planPullOver();

Check warning on line 574 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L574

Added line #L574 was not covered by tests
}

fixed_goal_planner_->setPreviousModuleOutput(getPreviousModuleOutput());
Expand Down Expand Up @@ -828,13 +828,13 @@ void GoalPlannerModule::decideVelocity()
}
}

BehaviorModuleOutput GoalPlannerModule::planRunning()
BehaviorModuleOutput GoalPlannerModule::planPullOver()

Check warning on line 831 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L831

Added line #L831 was not covered by tests
{
if (!hasDecidedPath()) {
return planPullOverAsCandidate();

Check warning on line 834 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L834

Added line #L834 was not covered by tests
}

return planPullOver();
return planPullOverAsOutput();

Check warning on line 837 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L837

Added line #L837 was not covered by tests
}

BehaviorModuleOutput GoalPlannerModule::planPullOverAsCandidate()

Check warning on line 840 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L840

Added line #L840 was not covered by tests
Expand All @@ -845,7 +845,7 @@ BehaviorModuleOutput GoalPlannerModule::planPullOverAsCandidate()
}

BehaviorModuleOutput output{};

Check warning on line 847 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L847

Added line #L847 was not covered by tests
const BehaviorModuleOutput pull_over_output = planPullOver();
const BehaviorModuleOutput pull_over_output = planPullOverAsOutput();
output.modified_goal = pull_over_output.modified_goal;
output.path = std::make_shared<PathWithLaneId>(generateStopPath());

Expand All @@ -866,7 +866,7 @@ BehaviorModuleOutput GoalPlannerModule::planPullOverAsCandidate()
return output;
}

Check warning on line 867 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L866-L867

Added lines #L866 - L867 were not covered by tests

BehaviorModuleOutput GoalPlannerModule::planPullOver()
BehaviorModuleOutput GoalPlannerModule::planPullOverAsOutput()

Check warning on line 869 in planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp

View check run for this annotation

Codecov / codecov/patch

planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp#L869

Added line #L869 was not covered by tests
{
// if pull over path candidates generation is not finished, use previous module output
if (thread_safe_data_.get_pull_over_path_candidates().empty()) {
Expand Down

0 comments on commit d90a5c1

Please sign in to comment.