Skip to content

Commit

Permalink
fixed few review comments
Browse files Browse the repository at this point in the history
Signed-off-by: Ayush1285 <ayush.singhftw@gmail.com>
  • Loading branch information
Ayush1285 committed Oct 2, 2024
1 parent 847f837 commit f9ed129
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ class Optimizer
* @param state fill state
*/
void integrateStateVelocities(
Eigen::Array<float, -1, 3> & trajectories,
Eigen::Array<float, Eigen::Dynamic, 3> & trajectories,
const Eigen::ArrayXXf & state) const;

/**
Expand Down
6 changes: 3 additions & 3 deletions nav2_mppi_controller/src/noise_generator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ void NoiseGenerator::reset(mppi::models::OptimizerSettings & settings, bool is_h
// Recompute the noises on reset, initialization, and fallback
{
std::unique_lock<std::mutex> guard(noise_lock_);
noises_vx_ = Eigen::ArrayXXf::Zero(settings_.batch_size, settings_.time_steps);
noises_vy_ = Eigen::ArrayXXf::Zero(settings_.batch_size, settings_.time_steps);
noises_wz_ = Eigen::ArrayXXf::Zero(settings_.batch_size, settings_.time_steps);
noises_vx_.setZero(settings_.batch_size, settings_.time_steps);
noises_vy_.setZero(settings_.batch_size, settings_.time_steps);
noises_wz_.setZero(settings_.batch_size, settings_.time_steps);
ready_ = true;
}

Expand Down
6 changes: 3 additions & 3 deletions nav2_mppi_controller/src/optimizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void Optimizer::propagateStateVelocitiesFromInitials(
}

void Optimizer::integrateStateVelocities(
Eigen::Array<float, -1, 3> & trajectory,
Eigen::Array<float, Eigen::Dynamic, 3> & trajectory,
const Eigen::ArrayXXf & sequence) const
{
float initial_yaw = static_cast<float>(tf2::getYaw(state_.pose.pose.orientation));
Expand Down Expand Up @@ -386,8 +386,8 @@ Eigen::ArrayXXf Optimizer::getOptimizedTrajectory()
{
const bool is_holo = isHolonomic();
Eigen::ArrayXXf sequence = Eigen::ArrayXXf(settings_.time_steps, is_holo ? 3 : 2);
Eigen::Array<float, -1, 3> trajectories =
Eigen::Array<float, -1, 3>(settings_.time_steps, 3);
Eigen::Array<float, Eigen::Dynamic, 3> trajectories =
Eigen::Array<float, Eigen::Dynamic, 3>(settings_.time_steps, 3);

sequence.col(0) = control_sequence_.vx;
sequence.col(1) = control_sequence_.wz;
Expand Down

0 comments on commit f9ed129

Please sign in to comment.