From d90a5c188ef37cdc55546c18008be8a09c0e1e5b Mon Sep 17 00:00:00 2001 From: kosuke55 Date: Mon, 13 Nov 2023 17:11:28 +0900 Subject: [PATCH] rename planPullOver Signed-off-by: kosuke55 --- .../scene_module/goal_planner/goal_planner_module.hpp | 2 +- .../scene_module/goal_planner/goal_planner_module.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/planning/behavior_path_planner/include/behavior_path_planner/scene_module/goal_planner/goal_planner_module.hpp b/planning/behavior_path_planner/include/behavior_path_planner/scene_module/goal_planner/goal_planner_module.hpp index 28a4bce8703f0..a0433da92be48 100644 --- a/planning/behavior_path_planner/include/behavior_path_planner/scene_module/goal_planner/goal_planner_module.hpp +++ b/planning/behavior_path_planner/include/behavior_path_planner/scene_module/goal_planner/goal_planner_module.hpp @@ -391,8 +391,8 @@ class GoalPlannerModule : public SceneModuleInterface bool canReturnToLaneParking(); // plan pull over path - BehaviorModuleOutput planRunning(); BehaviorModuleOutput planPullOver(); + BehaviorModuleOutput planPullOverAsOutput(); BehaviorModuleOutput planPullOverAsCandidate(); std::optional> selectPullOverPath( const std::vector & pull_over_path_candidates, diff --git a/planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp b/planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp index a596639364c5a..5f1f36bd3a684 100644 --- a/planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp +++ b/planning/behavior_path_planner/src/scene_module/goal_planner/goal_planner_module.cpp @@ -571,7 +571,7 @@ GoalCandidates GoalPlannerModule::generateGoalCandidates() const BehaviorModuleOutput GoalPlannerModule::plan() { if (goal_planner_utils::isAllowedGoalModification(planner_data_->route_handler)) { - return planRunning(); + return planPullOver(); } fixed_goal_planner_->setPreviousModuleOutput(getPreviousModuleOutput()); @@ -828,13 +828,13 @@ void GoalPlannerModule::decideVelocity() } } -BehaviorModuleOutput GoalPlannerModule::planRunning() +BehaviorModuleOutput GoalPlannerModule::planPullOver() { if (!hasDecidedPath()) { return planPullOverAsCandidate(); } - return planPullOver(); + return planPullOverAsOutput(); } BehaviorModuleOutput GoalPlannerModule::planPullOverAsCandidate() @@ -845,7 +845,7 @@ BehaviorModuleOutput GoalPlannerModule::planPullOverAsCandidate() } BehaviorModuleOutput output{}; - 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(generateStopPath()); @@ -866,7 +866,7 @@ BehaviorModuleOutput GoalPlannerModule::planPullOverAsCandidate() return output; } -BehaviorModuleOutput GoalPlannerModule::planPullOver() +BehaviorModuleOutput GoalPlannerModule::planPullOverAsOutput() { // if pull over path candidates generation is not finished, use previous module output if (thread_safe_data_.get_pull_over_path_candidates().empty()) {