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

modified _knn_from_dists to enable very large distance matrices #33

Merged
merged 1 commit into from
Oct 13, 2020
Merged

modified _knn_from_dists to enable very large distance matrices #33

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
10 changes: 6 additions & 4 deletions src/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,12 @@ function _knn_from_dists(dist_mat::AbstractMatrix{S}, k::Integer; ignore_diagona
# Ignore diagonal 0 elements (which will be smallest) when distance matrix represents pairwise distances of the same set
# If dist_mat represents distances between two different sets, diagonal elements be nontrivial
range = (1:k) .+ ignore_diagonal
knns_ = [partialsortperm(view(dist_mat, :, i), range) for i in 1:size(dist_mat, 2)]
dists_ = [dist_mat[:, i][knns_[i]] for i in eachindex(knns_)]
knns = hcat(knns_...)::Matrix{Int}
dists = hcat(dists_...)::Matrix{S}
knns = Array{Int,2}(undef,k,size(dist_mat,2))
dists = Array{S,2}(undef,k,size(dist_mat,2))
for i ∈ 1:size(dist_mat, 2)
knns[:,i] = partialsortperm(dist_mat[ :, i], range)
dists[:,i] = dist_mat[knns[:,i],i]
end
return knns, dists
end

Expand Down