Merge remote-tracking branch 'upstream/master' into smooth_arclength_interpolation

Author: SouthEndMusic

src/derivatives.jl

@@ -20,20 +20,26 @@ function _extrapolate_derivative_left(A, t, order)
     elseif extrapolation_left == ExtrapolationType.Constant
         zero(first(A.u) / one(A.t[1]))
     elseif extrapolation_left == ExtrapolationType.Linear
-        (order == 1) ? derivative(A, first(A.t)) : zero(first(A.u) / one(A.t[1]))
+        (order == 1) ? _derivative(A, first(A.t), 1) : zero(first(A.u) / one(A.t[1]))
     elseif extrapolation_left == ExtrapolationType.Extension
-        iguess = A.iguesser
-        (order == 1) ? _derivative(A, t, iguess) :
+        (order == 1) ? _derivative(A, t, length(A.t)) :
         ForwardDiff.derivative(t -> begin
-                _derivative(A, t, iguess)
+                _derivative(A, t, length(A.t))
             end, t)
     elseif extrapolation_left == ExtrapolationType.Periodic
         t_, _ = transformation_periodic(A, t)
-        derivative(A, t_, order)
+        (order == 1) ? _derivative(A, t_, A.iguesser) :
+        ForwardDiff.derivative(t -> begin
+                _derivative(A, t, A.iguesser)
+            end, t_)
     else
         # extrapolation_left == ExtrapolationType.Reflective
         t_, n = transformation_reflective(A, t)
-        isodd(n) ? -derivative(A, t_, order) : derivative(A, t_, order)
+        sign = isodd(n) ? -1 : 1
+        (order == 1) ? sign * _derivative(A, t_, A.iguesser) :
+        ForwardDiff.derivative(t -> begin
+                sign * _derivative(A, t, A.iguesser)
+            end, t_)
     end
 end
 
@@ -44,20 +50,27 @@ function _extrapolate_derivative_right(A, t, order)
     elseif extrapolation_right == ExtrapolationType.Constant
         zero(first(A.u) / one(A.t[1]))
     elseif extrapolation_right == ExtrapolationType.Linear
-        (order == 1) ? derivative(A, last(A.t)) : zero(first(A.u) / one(A.t[1]))
+        (order == 1) ? _derivative(A, last(A.t), length(A.t)) :
+        zero(first(A.u) / one(A.t[1]))
     elseif extrapolation_right == ExtrapolationType.Extension
-        iguess = A.iguesser
-        (order == 1) ? _derivative(A, t, iguess) :
+        (order == 1) ? _derivative(A, t, length(A.t)) :
         ForwardDiff.derivative(t -> begin
-                _derivative(A, t, iguess)
+                _derivative(A, t, length(A.t))
             end, t)
     elseif extrapolation_right == ExtrapolationType.Periodic
         t_, _ = transformation_periodic(A, t)
-        derivative(A, t_, order)
+        (order == 1) ? _derivative(A, t_, A.iguesser) :
+        ForwardDiff.derivative(t -> begin
+                _derivative(A, t, A.iguesser)
+            end, t_)
     else
         # extrapolation_right == ExtrapolationType.Reflective
         t_, n = transformation_reflective(A, t)
-        iseven(n) ? -derivative(A, t_, order) : derivative(A, t_, order)
+        sign = iseven(n) ? -1 : 1
+        (order == 1) ? sign * _derivative(A, t_, A.iguesser) :
+        ForwardDiff.derivative(t -> begin
+                sign * _derivative(A, t, A.iguesser)
+            end, t_)
     end
 end
 

src/integral_inverses.jl

@@ -13,12 +13,12 @@ Creates the inverted integral interpolation object from the given interpolation.
 
   - `A`: interpolation object satisfying the above requirements
 """
-invert_integral(A::AbstractInterpolation) = throw(IntegralInverseNotFoundError())
+invert_integral(::AbstractInterpolation) = throw(IntegralInverseNotFoundError())
 
-_integral(A::AbstractIntegralInverseInterpolation, idx, t) = throw(IntegralNotFoundError())
+_integral(::AbstractIntegralInverseInterpolation, idx, t) = throw(IntegralNotFoundError())
 
 function _derivative(A::AbstractIntegralInverseInterpolation, t::Number, iguess)
-    inv(A.itp(A(t)))
+    inv(A.itp(_interpolate(A, t, iguess)))
 end
 
 """

src/interpolation_methods.jl

@@ -13,10 +13,10 @@ function _extrapolate_left(A, t)
     if extrapolation_left == ExtrapolationType.None
         throw(LeftExtrapolationError())
     elseif extrapolation_left == ExtrapolationType.Constant
-        slope = derivative(A, first(A.t))
+        slope = _derivative(A, first(A.t), 1)
         first(A.u) + zero(slope * t)
     elseif extrapolation_left == ExtrapolationType.Linear
-        slope = derivative(A, first(A.t))
+        slope = _derivative(A, first(A.t), 1)
         first(A.u) + slope * (t - first(A.t))
     else
         _extrapolate_other(A, t, extrapolation_left)
@@ -28,10 +28,10 @@ function _extrapolate_right(A, t)
     if extrapolation_right == ExtrapolationType.None
         throw(RightExtrapolationError())
     elseif extrapolation_right == ExtrapolationType.Constant
-        slope = derivative(A, last(A.t))
+        slope = _derivative(A, last(A.t), length(A.t))
         last(A.u) + zero(slope * t)
     elseif extrapolation_right == ExtrapolationType.Linear
-        slope = derivative(A, last(A.t))
+        slope = _derivative(A, last(A.t), length(A.t))
         last(A.u) + slope * (t - last(A.t))
     else
         _extrapolate_other(A, t, extrapolation_right)

test/integral_inverse_tests.jl

@@ -17,6 +17,8 @@ function test_integral_inverses(method; args = [], kwargs = [])
         adiff = derivative(A_intinv, I)
         @test cdiff ≈ adiff
     end
+
+    @test @inferred(A(ts[37])) == A(ts[37])
 end
 
 @testset "Linear Interpolation" begin