Skip to content

Optimize and improve dispatch to sort* #303

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
dkarrasch merged 1 commit into from
Dec 4, 2022
Merged

Optimize and improve dispatch to sort* #303

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
20 changes: 10 additions & 10 deletions src/sparsevector.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Common definitions

import Base: sort, findall, copy!
import Base: sort!, findall, copy!
import LinearAlgebra: promote_to_array_type, promote_to_arrays_
using LinearAlgebra: _SpecialArrays, _DenseConcatGroup

Expand Down Expand Up @@ -2123,15 +2123,15 @@ function _densifystarttolastnz!(x::SparseVector)
end

#sorting
function sort(x::AbstractCompressedVector{Tv,Ti}; kws...) where {Tv,Ti}
allvals = push!(copy(nonzeros(x)),zero(Tv))
sinds = sortperm(allvals;kws...)
n,k = length(x),length(allvals)
z = findfirst(isequal(k),sinds)::Int
newnzind = Vector{Ti}(1:k-1)
newnzind[z:end] .+= n-k+1
newnzvals = allvals[deleteat!(sinds[1:k],z)]
typeof(x)(n,newnzind,newnzvals)
function sort!(x::AbstractCompressedVector; kws...)
nz = nonzeros(x)
sort!(nz; kws...)
i = searchsortedfirst(nz, zero(eltype(x)); kws...)
I = nonzeroinds(x)
Base.require_one_based_indexing(x, nz, I)
I[1:i-1] .= 1:i-1
I[i:end] .= i+length(x)-length(nz):length(x)
x
end

function fkeep!(f, x::AbstractCompressedVector{Tv}) where Tv
Expand Down