Merge pull request #147 from Evizero/parent

sglyon · web-flow · commit ade419b13926 · 2017-04-17T08:44:57.000-04:00
add support for Base.parent
diff --git a/src/b-splines/b-splines.jl b/src/b-splines/b-splines.jl
@@ -126,3 +126,6 @@ include("cubic.jl")
 include("indexing.jl")
 include("prefiltering.jl")
 include("../filter1d.jl")
+
+Base.parent{T,N,TCoefs,UT<:Union{BSpline{Linear},BSpline{Constant}}}(A::BSplineInterpolation{T,N,TCoefs,UT}) = A.coefs
+Base.parent{T,N,TCoefs,UT}(A::BSplineInterpolation{T,N,TCoefs,UT}) = throw(ArgumentError("The given BSplineInterpolation does not serve as a \"view\" for a parent array. This would only be true for Constant and Linear b-splines."))
diff --git a/src/extrapolation/extrapolation.jl b/src/extrapolation/extrapolation.jl
@@ -4,6 +4,8 @@ end
 Extrapolation{T,ITPT,IT,GT,ET}(::Type{T}, N, itp::ITPT, ::Type{IT}, ::Type{GT}, et::ET) =
     Extrapolation{T,N,ITPT,IT,GT,ET}(itp)
 
+Base.parent(A::Extrapolation) = A.itp
+
 # DimSpec{Flag} is not enough for extrapolation dispatch, since we allow nested tuples
 # However, no tuples should be nested deeper than this; the first level is for different
 # schemes in different dimensions, and the second level is for different schemes in
diff --git a/src/extrapolation/filled.jl b/src/extrapolation/filled.jl
@@ -9,6 +9,8 @@ function FilledExtrapolation{T,N,IT,GT}(itp::AbstractInterpolation{T,N,IT,GT}, f
     FilledExtrapolation{T,N,typeof(itp),IT,GT,typeof(fillvalue)}(itp, fillvalue)
 end
 
+Base.parent(A::FilledExtrapolation) = A.itp
+
 """
 `extrapolate(itp, fillvalue)` creates an extrapolation object that returns the `fillvalue` any time the indexes in `itp[x1,x2,...]` are out-of-bounds.
 """
diff --git a/src/gridded/gridded.jl b/src/gridded/gridded.jl
@@ -33,6 +33,8 @@ function GriddedInterpolation{N,TCoefs,TWeights<:Real,IT<:DimSpec{Gridded},pad}(
     GriddedInterpolation{T,N,TCoefs,IT,typeof(knts),pad}(knts, A)
 end
 
+Base.parent(A::GriddedInterpolation) = A.coefs
+
 # A type-stable version of map(collect, knots)
 mapcollect() = ()
 @inline mapcollect(k::AbstractVector) = (collect(k),)
diff --git a/src/scaling/scaling.jl b/src/scaling/scaling.jl
@@ -14,6 +14,8 @@ end
     :(ScaledInterpolation{$T,$N,$ITPT,$IT,$GT,$RT}(itp, ranges))
 end
 
+Base.parent(A::ScaledInterpolation) = A.itp
+
 """
 `scale(itp, xs, ys, ...)` scales an existing interpolation object to allow for indexing using other coordinate axes than unit ranges, by wrapping the interpolation object and transforming the indices from the provided axes onto unit ranges upon indexing.
 
diff --git a/test/b-splines/constant.jl b/test/b-splines/constant.jl
@@ -17,6 +17,8 @@ for (constructor, copier) in ((interpolate, x->x), (interpolate!, copy))
     itp3c = @inferred(constructor(copier(A3), BSpline(Constant()), OnCell()))
     itp3g = @inferred(constructor(copier(A3), BSpline(Constant()), OnGrid()))
 
+    @test parent(itp1c) === itp1c.coefs
+
     # Evaluation on provided data points
     # 1D
     for i in 1:length(A1)
@@ -58,4 +60,4 @@ for (constructor, copier) in ((interpolate, x->x), (interpolate!, copy))
     @test A1[N1] == itp1c[N1+.3]
 end
 
-end
+end
diff --git a/test/b-splines/cubic.jl b/test/b-splines/cubic.jl
@@ -19,6 +19,7 @@ for (constructor, copier) in ((interpolate, identity), (interpolate!, copy))
         for (A, f) in ((A0, f0), (A1, f1))
             itp1 = @inferred(constructor(copier(A), BSpline(Cubic(BC())), GT()))
             @test @inferred(size(itp1)) == size(A)
+            @test_throws ArgumentError parent(itp1)
 
             # test that inner region is close to data
             for x in 3.1:.2:8.1
diff --git a/test/b-splines/linear.jl b/test/b-splines/linear.jl
@@ -17,6 +17,8 @@ A2 = Float64[f(x,y) for x in 1:xmax, y in 1:ymax]
 for (constructor, copier) in ((interpolate, identity), (interpolate!, copy))
     itp1c = @inferred(constructor(copier(A1), BSpline(Linear()), OnCell()))
 
+    @test parent(itp1c) === itp1c.coefs
+
     # Just interpolation
     for x in 1:.2:xmax
         @test ≈(f(x),itp1c[x],atol=abs(0.1 * f(x)))
diff --git a/test/b-splines/mixed.jl b/test/b-splines/mixed.jl
@@ -11,6 +11,8 @@ for (constructor, copier) in ((interpolate, x->x), (interpolate!, copy))
         itp_b = @inferred(constructor(copier(A2), (BSpline(Quadratic(BC())), BSpline(Linear())), GT()))
         @test @inferred(size(itp_a)) == size(A2)
         @test @inferred(size(itp_b)) == size(A2)
+        @test_throws ArgumentError parent(itp_a)
+        @test_throws ArgumentError parent(itp_b)
 
         for j = 2:N-1, i = 2:N-1
             @test ≈(itp_a[i,j],A2[i,j],atol=sqrt(eps(A2[i,j])))
diff --git a/test/b-splines/quadratic.jl b/test/b-splines/quadratic.jl
@@ -9,6 +9,7 @@ for (constructor, copier) in ((interpolate, x->x), (interpolate!, copy))
     for BC in (Flat,Line,Free,Periodic,Reflect,Natural), GT in (OnGrid, OnCell)
         itp1 = @inferred(constructor(copier(A), BSpline(Quadratic(BC())), GT()))
         @test @inferred(size(itp1)) == size(A)
+        @test_throws ArgumentError parent(itp1)
 
         # test that inner region is close to data
         for x in 3.1:.2:8.1
@@ -64,4 +65,4 @@ let
     end
 end
 
-end
+end
diff --git a/test/extrapolation/non1.jl b/test/extrapolation/non1.jl
@@ -15,6 +15,7 @@ schemes = (
 )
 
 for etp in map(E -> extrapolate(itpg, E()), schemes), x in xinds
+    @test parent(etp) === itpg
     @test @inferred(getindex(etp, x)) ≈ A[x]
 end
 
@@ -24,6 +25,7 @@ A = OffsetArray(Float64[f(x)*g(y) for x in xinds, y in yinds], xinds, yinds)
 itp2 = interpolate(A, BSpline(Linear()), OnGrid())
 
 for (etp2,E) in map(E -> (extrapolate(itp2, E()), E), schemes)
+    @test parent(etp2) === itp2
     E == Periodic && continue  # g isn't periodic
     for y in yinds, x in xinds
         @test @inferred(getindex(etp2, x, y)) ≈ A[x, y]
diff --git a/test/extrapolation/runtests.jl b/test/extrapolation/runtests.jl
@@ -17,6 +17,8 @@ etpg = extrapolate(itpg, Flat())
 @test etpg[10.1] == etpg[11] == etpg[148.298452] == A[end]
 
 etpf = @inferred(extrapolate(itpg, NaN))
+@test typeof(etpf) <: Interpolations.FilledExtrapolation
+@test parent(etpf) === itpg
 
 @test @inferred(size(etpf)) == (xmax,)
 @test isnan(@inferred(getindex(etpf, -2.5)))
diff --git a/test/gridded/gridded.jl b/test/gridded/gridded.jl
@@ -37,6 +37,7 @@ for D in (Constant, Linear), G in (OnCell, OnGrid)
     A = rand(6,5)
     knots = (collect(linspace(1,size(A,1),size(A,1))),collect(linspace(1,size(A,2),size(A,2))))
     itp = @inferred(interpolate(knots, A, Gridded(D())))
+    @test parent(itp) === A
     @inferred(getindex(itp, 2, 2))
     @inferred(getindex(itp, CartesianIndex((2,2))))
     for j = 2:size(A,2)-1, i = 2:size(A,1)-1
@@ -70,4 +71,4 @@ for D in (Constant, Linear), G in (OnCell, OnGrid)
     @test itp[4,1.2] ≈ A[2,6]
 end
 
-end
+end
diff --git a/test/scaling/scaling.jl b/test/scaling/scaling.jl
@@ -9,6 +9,8 @@ using Base.Test
 itp = interpolate(1:1.0:10, BSpline(Linear()), OnGrid())
 
 sitp = @inferred(scale(itp, -3:.5:1.5))
+@test typeof(sitp) <: Interpolations.ScaledInterpolation
+@test parent(sitp) === itp
 
 for (x,y) in zip(-3:.05:1.5, 1:.1:10)
     @test sitp[x] ≈ y
