Skip to content

Commit a4fb0ad

Browse files
SteveMacenskienricosutera
authored andcommitted
25% speed up of goal critic; 1% speed up from vy striding when not in use
Signed-off-by: enricosutera <enricosutera@outlook.com>
1 parent 9366a93 commit a4fb0ad

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

nav2_mppi_controller/src/critics/goal_critic.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void GoalCritic::score(CriticData & data)
5757
xt::pow(traj_x - goal_x, 2) +
5858
xt::pow(traj_y - goal_y, 2));
5959

60-
data.costs += xt::pow(xt::mean(dists, {1}) * weight_, power_);
60+
data.costs += xt::pow(xt::mean(dists, {1}, immediate) * weight_, power_);
6161
}
6262

6363
} // namespace mppi::critics

nav2_mppi_controller/src/optimizer.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,8 +378,10 @@ void Optimizer::updateControlSequence()
378378
auto && softmaxes_extened = xt::eval(xt::view(softmaxes, xt::all(), xt::newaxis()));
379379

380380
xt::noalias(control_sequence_.vx) = xt::sum(state_.cvx * softmaxes_extened, 0, immediate);
381-
xt::noalias(control_sequence_.vy) = xt::sum(state_.cvy * softmaxes_extened, 0, immediate);
382381
xt::noalias(control_sequence_.wz) = xt::sum(state_.cwz * softmaxes_extened, 0, immediate);
382+
if (isHolonomic()) {
383+
xt::noalias(control_sequence_.vy) = xt::sum(state_.cvy * softmaxes_extened, 0, immediate);
384+
}
383385

384386
applyControlSequenceConstraints();
385387
}

0 commit comments

Comments
 (0)