b-splines pass

Author: jw3126

src/Interpolations.jl

@@ -35,7 +35,8 @@ export
 using Compat
 using WoodburyMatrices, Ratios, AxisAlgorithms
 
-import Base: convert, size, getindex, gradient, scale, promote_rule, ndims, eltype
+import Base: convert, size, getindex, gradient, promote_rule, ndims, eltype
+if isdefined(:scaling) import Base.scaling end
 
 abstract Flag
 abstract InterpolationType <: Flag

src/b-splines/b-splines.jl

@@ -73,6 +73,11 @@ function interpolate!{IT<:DimSpec{BSpline},GT<:DimSpec{GridType}}(A::AbstractArr
     interpolate!(tweight(A), A, it, gt)
 end
 
+offsetsym(off, d) = off == -1 ? Symbol("ixm_", d) :
+                    off ==  0 ? Symbol("ix_", d) :
+                    off ==  1 ? Symbol("ixp_", d) :
+                    off ==  2 ? Symbol("ixpp_", d) : error("offset $off not recognized")
+
 include("constant.jl")
 include("linear.jl")
 include("quadratic.jl")

src/b-splines/indexing.jl

@@ -54,7 +54,7 @@ function gradient_impl{T,N,TCoefs,IT<:DimSpec{BSpline},GT<:DimSpec{GridType},Pad
     # For each component of the gradient, alternately calculate
     # coefficients and set component
     n = count_interp_dims(IT, N)
-    exs = Array(Expr, 2n)
+    exs = Array{Expr}(2n)
     cntr = 0
     for d = 1:N
         if count_interp_dims(iextract(IT, d), 1) > 0
@@ -104,7 +104,7 @@ for R in [:Real, :Any]
         n = count_interp_dims(itp, N)
         Tg = promote_type(T, [x <: AbstractArray ? eltype(x) : x for x in xs]...)
         xargs = [:(xs[$d]) for d in 1:length(xs)]
-        :(gradient!(Array($Tg,$n), itp, $(xargs...)))
+        :(gradient!(Array{$Tg}($n), itp, $(xargs...)))
     end
 end
 
@@ -153,12 +153,7 @@ end
     n = count_interp_dims(itp,N)
     TH = promote_type(T, [x <: AbstractArray ? eltype(x) : x for x in xs]...)
     xargs = [:(xs[$d]) for d in 1:length(xs)]
-    :(hessian!(Array($TH,$n,$n), itp, $(xargs...)))
+    :(hessian!(Array{TH}($n,$n), itp, $(xargs...)))
 end
 
 hessian1{T}(itp::AbstractInterpolation{T,1}, x) = hessian(itp, x)[1,1]
-
-offsetsym(off, d) = off == -1 ? Symbol("ixm_", d) :
-                    off ==  0 ? Symbol("ix_", d) :
-                    off ==  1 ? Symbol("ixp_", d) :
-                    off ==  2 ? Symbol("ixpp_", d) : error("offset $off not recognized")

src/b-splines/prefiltering.jl

@@ -8,7 +8,7 @@ end
 
 function padded_index{N,pad}(sz::NTuple{N,Int}, ::Val{pad})
     szpad = ntuple(i->sz[i]+2padextract(pad,i), N)::NTuple{N,Int}
-    ind = Array(UnitRange{Int},N)
+    ind = Array{UnitRange{Int}}(N)
     for i in 1:N
         p = padextract(pad,i)
         ind[i] = 1+p:szpad[i]-p
@@ -21,7 +21,7 @@ function copy_with_padding{TC,IT<:DimSpec{InterpolationType}}(::Type{TC}, A, ::T
     Pad = padding(IT)
     ind,sz = padded_index(size(A), Pad)
     if sz == size(A)
-        coefs = copy!(Array(TC, size(A)), A)
+        coefs = copy!(Array{TC}(size(A)), A)
     else
         coefs = zeros(TC, sz...)
         coefs[ind...] = A
@@ -30,7 +30,7 @@ function copy_with_padding{TC,IT<:DimSpec{InterpolationType}}(::Type{TC}, A, ::T
 end
 
 prefilter!{TWeights, IT<:BSpline, GT<:GridType}(::Type{TWeights}, A, ::Type{IT}, ::Type{GT}) = A
-prefilter{TWeights, TC, IT<:BSpline, GT<:GridType}(::Type{TWeights}, ::Type{TC}, A, ::Type{IT}, ::Type{GT}) = prefilter!(TWeights, copy!(Array(TC, size(A)), A), IT, GT), Val{0}()
+prefilter{TWeights, TC, IT<:BSpline, GT<:GridType}(::Type{TWeights}, ::Type{TC}, A, ::Type{IT}, ::Type{GT}) = prefilter!(TWeights, copy!(Array{TC}(size(A)), A), IT, GT), Val{0}()
 
 function prefilter{TWeights,TC,IT<:Union{Cubic,Quadratic},GT<:GridType}(
     ::Type{TWeights}, ::Type{TC}, A::AbstractArray, ::Type{BSpline{IT}}, ::Type{GT}