Skip to content

Commit 3909638

Browse files
authored
Merge pull request #4 from comrob/vx-fix
Fix selection of middle speed in speed_profile
2 parents db91ea9 + a01c09b commit 3909638

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/AcceleratedDubins.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ function speed_profile(path::DubinsPathR2, v_min::Number, v_max::Number, a1::Flo
792792
return Inf, Inf
793793
end
794794

795-
vx = sqrt(det) / (2*xa) # second root is smaller than beggining speed
795+
vx = min(v_max, sqrt(det) / (2*xa)) # second root is smaller than beggining speed
796796
time += (vx - vs) / a1
797797
push_vals(time, vx)
798798
time += (vx - vs) / a2
@@ -837,7 +837,7 @@ function speed_profile(path::DubinsPathR2, v_min::Number, v_max::Number, a1::Flo
837837
return Inf, Inf
838838
end
839839

840-
vx = sqrt(det) / (2*xa) # second root is smaller than previous speed - unnecessary
840+
vx = min(v_max, sqrt(det) / (2*xa)) # second root is smaller than previous speed - unnecessary
841841
if vx < ve
842842
return Inf, Inf
843843
end
@@ -884,7 +884,7 @@ function speed_profile(path::DubinsPathR2, v_min::Number, v_max::Number, a1::Flo
884884
if det < 0
885885
return Inf, Inf
886886
end
887-
vx = sqrt(det) / (2*xa) # second root is smaller than previous speed - unnecessary
887+
vx = min(v_max, sqrt(det) / (2*xa)) # second root is smaller than previous speed - unnecessary
888888
if vx < ve
889889
return Inf, Inf
890890
end

0 commit comments

Comments
 (0)