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

Fix replace()/replace!() for ChainedVector when supplying count #113

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix replace()/replace!() for ChainedVector when supplying count #113

Show file tree
Hide file tree
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
42 changes: 40 additions & 2 deletions src/chainedvector.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,7 +981,45 @@ end

Base.replace(f::Base.Callable, a::ChainedVector) = ChainedVector([replace(f, A) for A in a.arrays])
Base.replace!(f::Base.Callable, a::ChainedVector) = (foreach(A -> replace!(f, A), a.arrays); return a)
Base.replace(a::ChainedVector, old_new::Pair...; count::Union{Integer,Nothing}=nothing) = ChainedVector([replace(A, old_new...; count=count) for A in a.arrays])
Base.replace!(a::ChainedVector, old_new::Pair...; count::Integer=typemax(Int)) = (foreach(A -> replace!(A, old_new...; count=count), a.arrays); return a)

function _check_count(count::Integer)
count < 0 && throw(DomainError(count, "`count` must not be negative"))
return min(count, typemax(Int)) % Int
end

function Base.replace(A::ChainedVector, old_new::Pair...; count::Integer=typemax(Int))
count = _check_count(count)
R = similar(A)
isempty(A) && return R
reps = 0
for (ai,ri) in zip(eachindex(A),eachindex(R))
R[ri] = A[ai]
for (old, new) in old_new
if R[ri] == old && reps < count
R[ri] = new
reps += 1
continue
end
end
end
return R
end

function Base.replace!(A::ChainedVector, old_new::Pair...; count::Integer=typemax(Int))
count = _check_count(count)
isempty(A) && return A
reps = 0
for i in eachindex(A)
for (old, new) in old_new
reps == count && return A
if A[i] == old
A[i] = new
reps += 1
continue
end
end
end
return A
end

Base.Broadcast.broadcasted(f::F, A::ChainedVector) where {F} = map(f, A)
7 changes: 7 additions & 0 deletions test/chainedvector.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,13 @@
@test map(x -> x == 1 ? 2.0 : x, x) == replace!(x, 1 => 2)
@test isempty(x)

@test replace!(ChainedVector([[1,2], [1,2]]), 2=>20) == [1,20,1,20]
@test replace!(ChainedVector([[1,2], [1,2]]), 2=>20, count=1) == [1,20,1,2]
@test replace!(ChainedVector([[1,2], [1,2]]), 2=>20, count=2) == [1,20,1,20]
x = [1,2]
@test replace!(ChainedVector([x,[2,3]]), 2=>99) == [1,99,99,3]
@test x == [1,99]

# copyto!
# ChainedVector dest: doffs, soffs, n
x = ChainedVector([[1,2,3], [4,5,6], [7,8,9,10]])
Expand Down
Loading