fixed getindex_return_type

Author: jw3126

src/b-splines/indexing.jl

@@ -1,4 +1,5 @@
 using Base.Cartesian
+using DualNumbers
 
 import Base.getindex
 
@@ -79,14 +80,13 @@ function gradient_impl{T,N,TCoefs,IT<:DimSpec{BSpline},GT<:DimSpec{GridType},Pad
     end
 end
 
-function getindex_return_type{T,N,TCoefs,IT<:DimSpec{BSpline},GT<:DimSpec{GridType},Pad}(::Type{BSplineInterpolation{T,N,TCoefs,IT,GT,Pad}}, argtypes)
-    Tret = eltype(TCoefs)
-    for a in argtypes
-        Tret = Base.promote_op(@functorize(*), Tret, a) # the macro is used to support julia 0.4
-    end
-    Tret
-end
+# there is a Heisenbug, when Base.promote_op is inlined into getindex_return_type
+# thats why we use this @noinline fence
+@noinline _promote_mul(a,b) = Base.promote_op(@functorize(*), a, b)
 
+@noinline function getindex_return_type{T,N,TCoefs,IT<:DimSpec{BSpline},GT<:DimSpec{GridType},Pad}(::Type{BSplineInterpolation{T,N,TCoefs,IT,GT,Pad}}, argtypes)
+    reduce(_promote_mul, eltype(TCoefs), argtypes)
+end
 
 @generated function gradient!{T,N}(g::AbstractVector, itp::BSplineInterpolation{T,N}, xs::Number...)
     length(xs) == N || error("Can only be called with $N indexes")

src/extrapolation/filled.jl

@@ -14,22 +14,28 @@ end
 """
 extrapolate{T,N,IT,GT}(itp::AbstractInterpolation{T,N,IT,GT}, fillvalue) = FilledExtrapolation(itp, convert(eltype(itp), fillvalue))
 
+function getindex_impl{T,N,ITP,IT,GT,FT}(fitp::Type{FilledExtrapolation{T,N,ITP,IT,GT,FT}}, args)
+   n = length(args)
+   n == N || return error("Must index $(N)-dimensional interpolation objects with $(nindexes(N))")
+
+   Tret = FT<:Number ? getindex_return_type(ITP, args) : FT
+   meta = Expr(:meta, :inline)
+   quote
+       $meta
+       # Check to see if we're in the extrapolation region, i.e.,
+       # out-of-bounds in an index
+       @nexprs $N d->((args[d] < lbound(fitp,d) || args[d] > ubound(fitp, d))) && return convert($Tret, fitp.fillvalue)::$Tret
+       # In the interpolation region
+       return convert($Tret, getindex(fitp.itp,args...))::$Tret
+   end
+end
+
+
 @generated function getindex{T,N,ITP,IT,GT,FT}(fitp::FilledExtrapolation{T,N,ITP,IT,GT,FT}, args::Number...)
-    n = length(args)
-    n == N || return error("Must index $(N)-dimensional interpolation objects with $(nindexes(N))")
-    Tret = FT<:Number ? getindex_return_type(ITP, args) : FT
-    meta = Expr(:meta, :inline)
-    quote
-        $meta
-        # Check to see if we're in the extrapolation region, i.e.,
-        # out-of-bounds in an index
-        @nexprs $N d->((args[d] < lbound(fitp,d) || args[d] > ubound(fitp, d)) && return convert($Tret, fitp.fillvalue))
-        # In the interpolation region
-        return getindex(fitp.itp,args...)
-    end
+    getindex_impl(fitp, args)
 end
 
 getindex{T}(fitp::FilledExtrapolation{T,1}, x::Number, y::Int) = y == 1 ? fitp[x] : throw(BoundsError())
 
 lbound(etp::FilledExtrapolation, d) = lbound(etp.itp, d)
-ubound(etp::FilledExtrapolation, d) = ubound(etp.itp, d)
+ubound(etp::FilledExtrapolation, d) = ubound(etp.itp, d)

test/extrapolation/runtests.jl

@@ -3,6 +3,7 @@ module ExtrapTests
 using Base.Test, DualNumbers
 using Interpolations
 
+
 f(x) = sin((x-3)*2pi/9 - 1)
 xmax = 10
 A = Float64[f(x) for x in 1:xmax]
@@ -27,7 +28,8 @@ etpf = @inferred(extrapolate(itpg, NaN))
 @test_throws BoundsError etpf[2.5,2]
 @test_throws ErrorException etpf[2.5,2,1]  # this will probably become a BoundsError someday
 
-@test_broken isa(@inferred(getindex(etpf, dual(-2.5,1))), Dual)
+x =  @inferred(getindex(etpf, dual(-2.5,1)))
+@test isa(x, Dual)
 
 etpl = extrapolate(itpg, Linear())
 k_lo = A[2] - A[1]

test/runtests.jl

@@ -3,11 +3,11 @@ module RunTests
 using Base.Test
 using Interpolations
 
-# b-spline interpolation tests
-include("b-splines/runtests.jl")
 
 # extrapolation tests
 include("extrapolation/runtests.jl")
+# b-spline interpolation tests
+include("b-splines/runtests.jl")
 
 # scaling tests
 include("scaling/runtests.jl")
@@ -28,4 +28,4 @@ include("issues/runtests.jl")
 
 end
 
-nothing
+nothing