Skip to content
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

Jump to bottom

More IdOffsetRange broadcasting #292

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

More IdOffsetRange broadcasting #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0f845bb
more IOR broadcasting
jishnub May 24, 2022
36c841c
Add test for Float64 mul
jishnub May 24, 2022
45f71d5
tests with BigInt/BigFloat
jishnub May 24, 2022
8a8f20b
test with typemax
jishnub May 24, 2022
13373df
version limit division tests
jishnub May 24, 2022
1fc8720
avoid bigfloat test on v1.0
jishnub May 24, 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
2 changes: 1 addition & 1 deletion .github/workflows/UnitTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# https://github.com/actions/toolkit/issues/399
fail-fast: false
matrix:
julia-version: ['1.0', '1', 'nightly']
julia-version: ['1.0', '1.6', '1', 'nightly']
os: [ubuntu-latest, windows-latest, macOS-latest]
julia-arch: [x64]
# only test one 32-bit job
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "OffsetArrays"
uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
version = "1.12.0"
version = "1.12.1"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
31 changes: 25 additions & 6 deletions src/axes.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,31 @@ for R in [:IIUR, :IdOffsetRange]
end

# offset-preserve broadcasting
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), r::IdOffsetRange{T}, x::Integer) where T =
IdOffsetRange{T}(r.parent .- x, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), r::IdOffsetRange{T}, x::Integer) where T =
IdOffsetRange{T}(r.parent .+ x, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), x::Integer, r::IdOffsetRange{T}) where T =
IdOffsetRange{T}(x .+ r.parent, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), r::IdOffsetRange) =
OffsetArray(.-UnitRange(r), r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), r::IdOffsetRange, x::Integer) =
IdOffsetRange(r.parent .- x, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(-), x::Integer, r::IdOffsetRange) =
OffsetArray(x .- UnitRange(r), r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), r::IdOffsetRange, x::Integer) =
IdOffsetRange(r.parent .+ x, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(+), x::Integer, r::IdOffsetRange) =
IdOffsetRange(x .+ r.parent, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), x::Number, r::IdOffsetRange) =
OffsetArray(x .* UnitRange(r), r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), r::IdOffsetRange, x::Number) =
OffsetArray(UnitRange(r) .* x, r.offset)
# specialize for AbstractFloat to resolve ambiguity with OrdinalRange
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), x::AbstractFloat, r::IdOffsetRange) =
OffsetArray(x .* UnitRange(r), r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(*), r::IdOffsetRange, x::AbstractFloat) =
OffsetArray(UnitRange(r) .* x, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(\), x::Number, r::IdOffsetRange) =
OffsetArray(x .\ UnitRange(r), r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(/), r::IdOffsetRange, x::Number) =
OffsetArray(UnitRange(r) ./ x, r.offset)
Broadcast.broadcasted(::Base.Broadcast.DefaultArrayStyle{1}, ::typeof(big), r::IdOffsetRange) =
IdOffsetRange(big.(r.parent), r.offset)

Base.show(io::IO, r::IdOffsetRange) = print(io, IdOffsetRange, "(values=",first(r), ':', last(r),", indices=",first(eachindex(r)),':',last(eachindex(r)), ")")

Expand Down
23 changes: 22 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,29 @@ end

# broadcasting behavior with scalars (issue #104)
r3 = (1 .+ OffsetArrays.IdOffsetRange(3:5, -1) .+ 1) .- 1
@test r3 isa OffsetArrays.IdOffsetRange
@test same_value(r3, 3:5)
check_indexed_by(r3, 0:2)
check_indexed_by(r3, axes(r3,1))

r = OffsetArrays.IdOffsetRange(3:5, -1)
rc = copyto!(similar(r), r)
n = big(typemax(Int))
@test @inferred(broadcast(+, r, n)) == @inferred(broadcast(+, n, r)) == rc .+ n
@test @inferred(broadcast(-, r)) == .-rc
@test @inferred(broadcast(big, r)) == big.(rc)
for n in Any[2, big(typemax(Int))]
@test @inferred(broadcast(+, r, n)) == @inferred(broadcast(+, n, r)) == rc .+ n
@test @inferred(broadcast(-, r, n)) == rc .- n
@test @inferred(broadcast(-, n, r)) == n .- rc
@test @inferred(broadcast(*, r, n)) == @inferred(broadcast(*, n, r)) == rc .* n
if VERSION >= v"1.6.0"
# this test fails on v1.0 due to a bug in evaluating (3:5) / big(2)
@test @inferred(broadcast(/, r, n)) == @inferred(broadcast(\, n, r)) == rc ./ n
end
end
for n in (VERSION >= v"1.6.0" ? Any[2.0, big(2.0)] : Any[2.0])
@test @inferred(broadcast(*, r, n)) == @inferred(broadcast(*, n, r)) == rc .* n
end

@testset "Idempotent indexing" begin
@testset "Indexing into an IdOffsetRange" begin
Expand Down