Merge pull request #351 from JuliaMath/teh/axes

Fix eachvalue for offset arrays

Author: timholy

Project.toml

@@ -1,6 +1,6 @@
 name = "Interpolations"
 uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59"
-version = "0.12.7"
+version = "0.12.8"
 
 [deps]
 AxisAlgorithms = "13072b0f-2c55-5437-9ae7-d433b7a33950"

src/scaling/scaling.jl

@@ -210,7 +210,7 @@ function Base.iterate(iter::ScaledIterator)
     item, cistate = ret
     wis = getindex.(iter.wis, Tuple(item))
     ces = cache_evaluations(iter.sitp.itp.coefs, indexes(wis[1]), weights(wis[1]), Base.tail(wis))
-    return _reduce(+, weights(wis[1]).*ces), ScaledIterState(cistate, first(iter.breaks1), ces)
+    return _reduce(+, weights(wis[1]).*ces), ScaledIterState(cistate, firstindex(iter.breaks1), ces)
 end
 
 function Base.iterate(iter::ScaledIterator, state)
@@ -227,7 +227,7 @@ function Base.iterate(iter::ScaledIterator, state)
     # Re-evaluate. We're being a bit lazy here: in some cases, some of the cached values could be reused
     wis = getindex.(iter.wis, Tuple(item))
     ces = cache_evaluations(iter.sitp.itp.coefs, indexes(wis[1]), weights(wis[1]), Base.tail(wis))
-    return _reduce(+, weights(wis[1]).*ces), ScaledIterState(cistate, isnext1 ? state.ibreak+1 : first(iter.breaks1), ces)
+    return _reduce(+, weights(wis[1]).*ces), ScaledIterState(cistate, isnext1 ? state.ibreak+1 : firstindex(iter.breaks1), ces)
 end
 
 _reduce(op, list) = op(list[1], _reduce(op, Base.tail(list)))

test/scaling/scaling.jl

@@ -128,3 +128,10 @@ end
     sitp = scale(interpolate(A, BSpline(Cubic(Line(OnGrid())))), 1:3, 1:2)
     @test first(eachvalue(sitp)) ≈ @SVector [1.,2.]
 end
+
+@testset "axes" begin
+    saxs = -50:10:50
+    itp = interpolate(-5:5, BSpline(Linear()))
+    sitp = @inferred(scale(itp, saxs))
+    @test collect(eachvalue(sitp)) ≈ OffsetArray(-5:0.1:5, -50:50)
+end