adds IdView and DistView

sadit · Feb 18, 2023 · 5dab3d6 · 5dab3d6 · sadit · Feb 18, 2023
1 parent 92a5dfe
commit 5dab3d6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/src/knnresult.jl b/src/knnresult.jl
@@ -1,6 +1,6 @@
 # This file is a part of SimilaritySearch.jl
 # export AbstractResult
-export KnnResult
+export KnnResult, IdView, DistView
 export covradius, maxlength, reuse!
 
 """
@@ -128,14 +128,23 @@ end
 @inline Base.eachindex(res::KnnResult) = firstindex(res):lastindex(res)
 Base.eltype(res::KnnResult) = IdWeight
 
-##### iterator interface
-### KnnResult
-"""
-    Base.iterate(res::KnnResult, state::Int=1)
+struct IdView
+    res::KnnResult
+end
 
-Support for iteration
-"""
-function Base.iterate(res::KnnResult, i::Int=1)
+struct DistView
+    res::KnnResult
+end
+
+@inline Base.getindex(v::IdView, i::Integer) = v.res[i].id
+@inline Base.getindex(v::DistView, i::Integer) = v.res[i].weight
+@inline Base.eachindex(v::IdView) = 1:length(v.res)
+@inline Base.eachindex(v::DistView) = 1:length(v.res)
+@inline Base.length(v::IdView) = length(v.res)
+@inline Base.length(v::DistView) = length(v.res)
+
+##### iterator interface
+function Base.iterate(res::Union{KnnResult,IdView,DistView}, i::Int=1)
     n = length(res)
     (n == 0 || i > n) && return nothing
     @inbounds res[i], i+1

diff --git a/src/opt.jl b/src/opt.jl
@@ -56,9 +56,7 @@ function create_error_function(index::AbstractSearchIndex, gold, knnlist::Vector
         recall = if gold !== nothing
             for (i, res) in enumerate(knnlist)
                 empty!(R[i])
-                for item in res
-                    push!(R[i], item.id)
-                end
+                union!(R[i], IdView(res))
             end
 
             macrorecall(gold, R)

diff --git a/src/perf.jl b/src/perf.jl
@@ -8,12 +8,12 @@ export recallscore, macrorecall
 Compute recall and precision scores from the result sets.
 """
 function recallscore(gold, res)::Float64
-    length(intersect(_convert_as_set(gold), _convert_as_set(res))) / length(gold)
+    length(intersect(as_set(gold), as_set(res))) / length(gold)
 end
 
-_convert_as_set(a::Set) = a
-_convert_as_set(a::AbstractVector) = Set(a)
-_convert_as_set(a::KnnResult) = Set(item.id for item in res)
+as_set(a::Set) = a
+as_set(a::AbstractVector) = Set(a)
+as_set(res::KnnResult) = Set(IdView(res))
 
 """
     macrorecall(goldI::AbstractMatrix, resI::AbstractMatrix, k=size(goldI, 1))::Float64