Skip to content

Origin accepts Integer arguments #229

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

Merged
jishnub merged 2 commits into from
Apr 24, 2021
Merged

Origin accepts Integer arguments #229

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c205797
Origin accepts Integer arguments
jishnub Apr 24, 2021
35833ca
Origin accepts Numbers
jishnub Apr 24, 2021
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
11 changes: 6 additions & 5 deletions src/origin.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ julia> OffsetArray(a, OffsetArrays.Origin(0)) # short notation for `Origin(0, 0)
3 4
```
"""
struct Origin{T<:Union{Tuple, Int}}
struct Origin{T<:Union{Tuple{Vararg{Int}}, Int}}
index::T
end
Origin(I::NTuple{N, Int}) where N = Origin{typeof(I)}(I)
Origin(I::CartesianIndex) = Origin(I.I)
Origin(I1::Int, In::Int...) = Origin((I1, In...))
Origin(I::Tuple{Vararg{Int}}) = Origin{typeof(I)}(I)
Origin(I::Tuple{Vararg{Integer}}) = Origin(map(Int, I))
Origin(I::CartesianIndex) = Origin(Tuple(I))
Origin(I::Integer...) = Origin(I)
# Origin(0) != Origin((0, )) but they work the same with broadcasting
Origin(n::Int) = Origin{Int}(n)
Origin(n::Integer) = Origin{Int}(Int(n))

(o::Origin)(A::AbstractArray) = o.index .- first.(axes(A))

Expand Down
11 changes: 10 additions & 1 deletion test/origin.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ using OffsetArrays: Origin
@test Origin(0) != Origin((0, ))
@test Origin(CartesianIndex(1, 2)) === Origin((1, 2)) === Origin(1, 2)

@test Origin(Int32.((1,2))) == Origin(Int64.((1,2)))
@test Origin(Int32.((1,2))...) == Origin(Int64.((1,2))...)
@test Origin(Int32(1)) == Origin(Int64(1))

# 0d
A = OffsetArray(zeros())
B = OffsetArray(zeros(), Origin())
@test axes(A) == axes(B)

# 1d
v = [1, 2]
@test get_origin(OffsetArray(v, Origin(2))) == (2, )
Expand All @@ -27,7 +36,7 @@ using OffsetArrays: Origin
oa = OffsetArray(a, -3, -3, -3)
@test get_origin(OffsetArray(oa, Origin(0))) == (0, 0, 0)
@test get_origin(OffsetArray(oa, Origin(1, 2, 3))) == (1, 2, 3)

# Scalar broadcasting
let
a = [ [1,2,3], [4,5,6] ]
Expand Down