Skip to content

Disallow StepRange{<:Quantity{<:AbstractFloat}} #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Disallow StepRange{<:Quantity{<:AbstractFloat}} #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e8fa9
Disallow StepRange{<:Quantity{<:AbstractFloat}}
sostock Sep 14, 2022
613d61a
More tests
sostock Sep 14, 2022
d9339c9
Strip units to calculate last element
sostock Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/range.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,20 @@ end
Base._range(nothing, one(stop), stop, len)
end

Base.steprange_last(start::AbstractQuantity, step, stop::AbstractQuantity) =
_unitful_steprange_last(start, step, stop)
Base.steprange_last(start, step::AbstractQuantity, stop) =
_unitful_steprange_last(start, step, stop)
Base.steprange_last(start::AbstractQuantity, step::AbstractQuantity, stop::AbstractQuantity) =
_unitful_steprange_last(start, step, stop)

function _unitful_steprange_last(start, step, stop)::typeof(stop)
unitless_start = ustrip(start)
unitless_step = ustrip(absoluteunit(unit(start)), step)
unitless_stop = ustrip(stop)
Base.steprange_last(unitless_start, unitless_step, unitless_stop) * unit(stop)
end

*(r::AbstractRange, y::Units) = range(first(r)*y, step=step(r)*y, length=length(r))

# first promote start and stop, leaving step alone
Expand Down
22 changes: 19 additions & 3 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,22 @@ end
@test @inferred(last(range(1m, step=2mm, length=4))) === (503//500)m
@test_throws DimensionError(1m, 2V) range(1m, step=2V, length=5)
@test_throws ArgumentError 1m:0m:5m
@test_throws ArgumentError StepRange(1.0m, 1mm, 2.0m)
@test_throws ArgumentError StepRange(1m, 1f3mm, 2m)
@test_throws ArgumentError StepRange(1, 1e3mm/m, 2)
@test_throws ArgumentError StepRange(1f3mm/m, 1, 2f3mm/m)
@test_throws ArgumentError StepRange{typeof(1.0m),typeof(1mm)}(1m, 1mm, 2m)
@test_throws ArgumentError StepRange{typeof(1.0m),typeof(1.0mm)}(1m, 1mm, 2m)
@test_throws ArgumentError StepRange{typeof(1.0mm/m),Int}(1000mm/m, 1, 2000mm/m)
@test_throws ArgumentError StepRange{Rational{Int},typeof(1f0mm/m)}(1//1, 1f3mm/m, 2//1)
@test_throws ArgumentError StepRange{typeof(1m),typeof((1//1)mm)}(1m, 1mm, 2m)
@test_throws ArgumentError StepRange{typeof(1m),typeof(1mm)}(1m, 1mm, 2m)
@test_throws ArgumentError StepRange{typeof(1m/mm),Int}(1m/mm, 1, 2m/mm)
@test_throws ArgumentError StepRange{Int,typeof(1mm/m)}(1, 1mm/m, 2)
@test @inferred(StepRange(1m, (1000//1)mm, 2m)) isa StepRange{typeof(1m), typeof((1000//1)mm)}
@test @inferred(StepRange(1m, 1000mm, 2m)) isa StepRange{typeof(1m), typeof(1000mm)}
@test @inferred(StepRange(1m/mm, 1000, 2m/mm)) isa StepRange{typeof(1m/mm), Int}
@test @inferred(StepRange(1, 1000mm/m, 2)) isa StepRange{Int, typeof(1000mm/m)}
end
@testset ">> StepRangeLen" begin
@test isa(@inferred(colon(1.0m, 1m, 5m)), StepRangeLen{typeof(1.0m)})
Expand Down Expand Up @@ -1485,9 +1501,9 @@ Base.show(io::IO, ::MIME"text/plain", ::Foo) = print(io, "42.0")

# Concise printing of affine ranges with mixed step unit
@test repr(StepRange(1u"°C", 1u"K", 3u"°C")) == "(1:3) °C"
@test repr(StepRange(1u"°C", 1.0u"K", 3u"°C")) == "(1:3) °C"
@test repr(StepRange(1.0u"°C", 1u"K", 3.0u"°C")) == "(1.0:1.0:3.0) °C"
@test repr(StepRange(1.0u"°C", 1.0u"K", 3.0u"°C")) == "(1.0:1.0:3.0) °C"
@test repr(StepRange(1u"°C", (1//1)u"K", 3u"°C")) == "(1:3) °C"
@test repr(StepRange((1//1)u"°C", 1u"K", (3//1)u"°C")) == "(1//1:3//1) °C"
@test repr(StepRange((1//1)u"°C", (1//1)u"K", (3//1)u"°C")) == "(1//1:3//1) °C"
@test repr(StepRange((0//1)u"°F", 1u"K", (9//1)u"°F")) == "(0//1:9//5:9//1) °F"
@test repr(StepRangeLen{typeof(1.0u"°C"),typeof(1.0u"°C"),typeof(1u"K")}(1.0u"°C", 1u"K", 3, 1)) == "(1.0:1.0:3.0) °C"
@static if VERSION < v"1.5"
Expand Down