Skip to content

Commit a55016b

Browse files
committed
fix(goal_planner): remove velocity factor
Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
1 parent 55ffc57 commit a55016b

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

planning/behavior_path_planner/autoware_behavior_path_goal_planner_module/include/autoware/behavior_path_goal_planner_module/goal_planner_module.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ class GoalPlannerModule : public SceneModuleInterface
456456
// steering factor
457457
void updateSteeringFactor(
458458
const PullOverContextData & context_data, const std::array<Pose, 2> & pose,
459-
const std::array<double, 2> distance, const uint16_t type);
459+
const std::array<double, 2> distance);
460460

461461
// rtc
462462
std::pair<double, double> calcDistanceToPathChange(

planning/behavior_path_planner/autoware_behavior_path_goal_planner_module/src/goal_planner_module.cpp

+2-20
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,6 @@ GoalPlannerModule::GoalPlannerModule(
121121
initializeSafetyCheckParameters();
122122
}
123123

124-
steering_factor_interface_.init(PlanningBehavior::GOAL_PLANNER);
125-
velocity_factor_interface_.init(PlanningBehavior::GOAL_PLANNER);
126-
127124
/**
128125
* NOTE: Add `universe_utils::ScopedTimeTrack st(__func__, *time_keeper_);` to functions called
129126
* from the main thread only.
@@ -1360,20 +1357,8 @@ void GoalPlannerModule::setTurnSignalInfo(
13601357

13611358
void GoalPlannerModule::updateSteeringFactor(
13621359
const PullOverContextData & context_data, const std::array<Pose, 2> & pose,
1363-
const std::array<double, 2> distance, const uint16_t type)
1360+
const std::array<double, 2> distance)
13641361
{
1365-
const uint16_t steering_factor_direction = std::invoke([&]() {
1366-
const auto turn_signal = calcTurnSignalInfo(context_data);
1367-
if (turn_signal.turn_signal.command == TurnIndicatorsCommand::ENABLE_LEFT) {
1368-
return SteeringFactor::LEFT;
1369-
} else if (turn_signal.turn_signal.command == TurnIndicatorsCommand::ENABLE_RIGHT) {
1370-
return SteeringFactor::RIGHT;
1371-
}
1372-
return SteeringFactor::STRAIGHT;
1373-
});
1374-
1375-
steering_factor_interface_.set(pose, distance, steering_factor_direction, type, "");
1376-
13771362
const uint16_t planning_factor_direction = std::invoke([&]() {
13781363
const auto turn_signal = calcTurnSignalInfo(context_data);
13791364
if (turn_signal.turn_signal.command == TurnIndicatorsCommand::ENABLE_LEFT) {
@@ -1597,12 +1582,9 @@ void GoalPlannerModule::postProcess()
15971582

15981583
updateSteeringFactor(
15991584
context_data, {pull_over_path.start_pose(), pull_over_path.modified_goal_pose()},
1600-
{distance_to_path_change.first, distance_to_path_change.second},
1601-
has_decided_path ? SteeringFactor::TURNING : SteeringFactor::APPROACHING);
1585+
{distance_to_path_change.first, distance_to_path_change.second});
16021586

16031587
set_longitudinal_planning_factor(pull_over_path.full_path());
1604-
1605-
setVelocityFactor(pull_over_path.full_path());
16061588
}
16071589

16081590
BehaviorModuleOutput GoalPlannerModule::planWaitingApproval()

0 commit comments

Comments
 (0)