Fix function overwrite warning in tests

Author: Tomas Lycken

src/scaling/scaling.jl

@@ -70,9 +70,10 @@ basetype(sitp::ScaledInterpolation) = basetype(typeof(sitp))
 
 # @eval uglyness required for disambiguation with method in b-splies/indexing.jl
 # also, GT is only specified to avoid disambiguation warnings on julia 0.4
-gradient{T,N,ITPT,IT<:DimSpec{InterpolationType}}(sitp::ScaledInterpolation{T,N,ITPT,IT}, xs::Real...) = gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
-gradient{T,N,ITPT,IT<:DimSpec{InterpolationType}}(sitp::ScaledInterpolation{T,N,ITPT,IT}, xs...) = gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
-
+gradient{T,N,ITPT,IT<:DimSpec{InterpolationType},GT<:DimSpec{GridType}}(sitp::ScaledInterpolation{T,N,ITPT,IT,GT}, xs::Real...) =
+        gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
+gradient{T,N,ITPT,IT<:DimSpec{InterpolationType},GT<:DimSpec{GridType}}(sitp::ScaledInterpolation{T,N,ITPT,IT,GT}, xs...) =
+        gradient!(Array(T,count_interp_dims(IT,N)), sitp, xs...)
 @generated function gradient!{T,N,ITPT,IT}(g, sitp::ScaledInterpolation{T,N,ITPT,IT}, xs::Number...)
     ndims(g) == 1 || throw(DimensionMismatch("g must be a vector (but had $(ndims(g)) dimensions)"))
     length(xs) == N || throw(DimensionMismatch("Must index into $N-dimensional scaled interpolation object with exactly $N indices (you used $(length(xs)))"))

test/b-splines/linear.jl

@@ -6,19 +6,23 @@ using Base.Test
 xmax = 10
 g1(x) = sin((x-3)*2pi/(xmax-1)-1)
 f(x) = g1(x)
-
 A1 = Float64[f(x) for x in 1:xmax]
+fr(x) = (x^2) // 40 + 2
+
+ymax = 10
+g2(y) = cos(y/6)
+f(x,y) = g1(x)*g2(y)
+A2 = Float64[f(x,y) for x in 1:xmax, y in 1:ymax]
 
-for (constructor, copier) in ((interpolate, x->x), (interpolate!, copy))
+for (constructor, copier) in ((interpolate, _->_), (interpolate!, copy))
     itp1c = @inferred(constructor(copier(A1), BSpline(Linear()), OnCell()))
 
     # Just interpolation
     for x in 1:.2:xmax
         @test_approx_eq_eps f(x) itp1c[x] abs(.1*f(x))
     end
 
-    # Rational element types
-    fr(x) = (x^2) // 40 + 2
+    # Rational element types    
     A1R = Rational{Int}[fr(x) for x in 1:10]
     itp1r = @inferred(constructor(copier(A1R), BSpline(Linear()), OnGrid()))
     @test @inferred(size(itp1r)) == size(A1R)
@@ -27,10 +31,6 @@ for (constructor, copier) in ((interpolate, x->x), (interpolate!, copy))
     @test eltype(itp1r) == Rational{Int}
 
     # 2D
-    g2(y) = cos(y/6)
-    f(x,y) = g1(x)*g2(y)
-    ymax = 10
-    A2 = Float64[f(x,y) for x in 1:xmax, y in 1:ymax]
     itp2 = @inferred(constructor(copier(A2), BSpline(Linear()), OnGrid()))
     @test @inferred(size(itp2)) == size(A2)