Skip to content

Commit fb06e0d

Browse files
committed
Reapply "Unclamp noise velocity. (ros-navigation#5266)"
This reverts commit 52a4315.
1 parent 32daefc commit fb06e0d

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

nav2_mppi_controller/include/nav2_mppi_controller/motion_models.hpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,13 @@ class MotionModel
8989
0).select(state.vx.col(i - 1) + max_delta_vx,
9090
state.vx.col(i - 1) - min_delta_vx);
9191

92-
state.cvx.col(i - 1) = state.cvx.col(i - 1)
92+
state.vx.col(i) = state.cvx.col(i - 1)
9393
.cwiseMax(lower_bound_vx)
9494
.cwiseMin(upper_bound_vx);
95-
state.vx.col(i) = state.cvx.col(i - 1);
9695

97-
state.cwz.col(i - 1) = state.cwz.col(i - 1)
96+
state.wz.col(i) = state.cwz.col(i - 1)
9897
.cwiseMax(state.wz.col(i - 1) - max_delta_wz)
9998
.cwiseMin(state.wz.col(i - 1) + max_delta_wz);
100-
state.wz.col(i) = state.cwz.col(i - 1);
10199

102100
if (is_holo) {
103101
auto lower_bound_vy = (state.vy.col(i - 1) >
@@ -106,10 +104,10 @@ class MotionModel
106104
auto upper_bound_vy = (state.vy.col(i - 1) >
107105
0).select(state.vy.col(i - 1) + max_delta_vy,
108106
state.vy.col(i - 1) - min_delta_vy);
109-
state.cvy.col(i - 1) = state.cvy.col(i - 1)
107+
108+
state.vy.col(i) = state.cvy.col(i - 1)
110109
.cwiseMax(lower_bound_vy)
111110
.cwiseMin(upper_bound_vy);
112-
state.vy.col(i) = state.cvy.col(i - 1);
113111
}
114112
}
115113
}

0 commit comments

Comments
 (0)