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

Solve all problems with extra indirection #163

Merged
merged 1 commit into from
Oct 29, 2021
Merged

Solve all problems with extra indirection #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 3 additions & 28 deletions src/trues.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,8 @@ const Falses = Zeros{Bool, N, Axes} where {N, Axes}


# y[mask] = x when mask isa Trues (cf y[:] = x)
# Supported here only for arrays with standard OneTo axes.
function Base.setindex!(y::AbstractArray{T,N}, x, mask::Trues{N, NTuple{N,Base.OneTo{Int}}}) where {T,N}
if axes(x) isa NTuple{N,Base.OneTo{Int}} && axes(y) isa NTuple{N,Base.OneTo{Int}}
@boundscheck size(y) == size(mask) || throw(BoundsError(y, mask))
@boundscheck size(x) == size(mask) || throw(DimensionMismatch(
"tried to assign $(length(x)) elements to $(length(y)) destinations"))
@boundscheck checkbounds(y, mask)
return copyto!(y, x)
end
return setindex!(y, x, trues(size(mask))) # fall back on usual setindex!
end

# x[mask] when mask isa Trues (cf x[trues(size(x))] or x[:])
# Supported here only for arrays with standard OneTo axes.
function Base.getindex(x::AbstractArray{T,N}, mask::Trues{N, NTuple{N,Base.OneTo{Int}}}) where {T,N}
if axes(x) isa NTuple{N,Base.OneTo{Int}}
@boundscheck size(x) == size(mask) || throw(BoundsError(x, mask))
return vec(x)
end
return x[trues(size(x))] # else revert to usual getindex method
end

# https://github.com/JuliaArrays/FillArrays.jl/issues/148 and 150
function Base.getindex(
a::AbstractFill{T, N, Tuple{Vararg{Base.OneTo{Int}, N}}},
b::Trues{N, Tuple{Vararg{Base.OneTo{Int}, N}}},
) where {T, N}
@boundscheck size(a) == size(b) || throw(BoundsError(a, b))
return Fill(getindex_value(a), length(a))
function Base.to_indices(A::AbstractArray{T,N}, inds, I::Tuple{Trues{N}}) where {T,N}
@boundscheck axes(A) == axes(I[1]) || Base.throw_boundserror(A, I[1])
(vec(LinearIndices(A)),)
end