disallow parent for BSplines other than Constant and Linear

Author: Evizero

src/b-splines/b-splines.jl

@@ -30,8 +30,6 @@ function BSplineInterpolation{N,Tel,TWeights<:Real,IT<:DimSpec{BSpline},GT<:DimS
     BSplineInterpolation{T,N,typeof(A),IT,GT,pad}(A)
 end
 
-Base.parent(A::BSplineInterpolation) = A.coefs
-
 # Utilities for working either with scalars or tuples/tuple-types
 iextract{T<:BSpline}(::Type{T}, d) = T
 iextract(t, d) = t.parameters[d]
@@ -128,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."))

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

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)))

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])))

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