diff --git a/src/scaling_offset_types.jl b/src/scaling_offset_types.jl index 0a5ed6f..03a5fed 100644 --- a/src/scaling_offset_types.jl +++ b/src/scaling_offset_types.jl @@ -71,7 +71,7 @@ get_scale(sz, ::Type{ScaNorm}) = 1 ./ (max.(sz .- 1, 1)) get_scale(sz, ::Type{ScaMid}) = 1 ./ (max.((sz .- 1)./2, 1)) # reaches 1.0 at the outermost pixel. get_scale(sz, ::Type{ScaFT}) = 0.5 ./ (max.(sz ./ 2, 1)) # get_scale(size, ::Type{ScaRFT}) = 0.5 ./ (max.(Base.setindex(size./ 2,size[1]-1,1), 1)) # These scales are wrong! They need the information on the real-space size! -get_scale(sz, ::Type{ScaFTEdge}) = 1 ./ (max.(sz ./ 2, 1)) +get_scale(sz, ::Type{ScaFTEdge}) = 1 ./ (max.(sz .รท 2, 1)) # get_scale(size, ::Type{ScaRFTEdge}) = 1 ./ (max.(Base.setindex(size./ 2,size[1]-1,1), 1)) get_scale(sz, t::Number) = ntuple(i -> t, length(sz)) get_scale(dummy, t::NTuple) = t diff --git a/test/concrete_generators.jl b/test/concrete_generators.jl index b81298e..b4d7253 100644 --- a/test/concrete_generators.jl +++ b/test/concrete_generators.jl @@ -88,7 +88,7 @@ @test rr((10,), scale = ScaNorm) == [0.5555555555555556, 0.4444444444444444, 0.3333333333333333, 0.2222222222222222, 0.1111111111111111, 0.0, 0.1111111111111111, 0.2222222222222222, 0.3333333333333333, 0.4444444444444444] @test rr((10,), scale = ScaFT) == [0.5, 0.4, 0.30000000000000004, 0.2, 0.1, 0.0, 0.1, 0.2, 0.30000000000000004, 0.4] - @test rr((11,), scale = ScaFTEdge) == [ 0.9090909090909092, 0.7272727272727273, 0.5454545454545454, 0.36363636363636365, 0.18181818181818182, 0.0, 0.18181818181818182, 0.36363636363636365, 0.5454545454545454, 0.7272727272727273, 0.9090909090909092] + @test rr((11,), scale = ScaFTEdge) == [1.0, 0.8, 0.6000000000000001, 0.4, 0.2, 0.0, 0.2, 0.4, 0.6000000000000001, 0.8, 1.0] # 1.0, 0.8, 0.6000000000000001, 0.4, 0.2, 0.0, 0.2, 0.4, 0.6000000000000001, 0.8, 1.0] @test rr((10,), scale = ScaFTEdge) == [1.0, 0.8, 0.6000000000000001, 0.4, 0.2, 0.0, 0.2, 0.4, 0.6000000000000001, 0.8]