Improve type stability

Wrapping N and K in Val in the base method of count_kmers
AntonOresten · Mar 24, 2024 · 5bb8db9 · 5bb8db9 · AntonOresten · Mar 24, 2024
1 parent 3848024
commit 5bb8db9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/count.jl b/src/count.jl
@@ -16,8 +16,8 @@ function count_kmers!(kmer_array::KmerArray{N, K}, sequence; reset::Bool = true)
 end
 
 """
-    count_kmers(sequence, K, T=Int, zeros=zeros; N=default_alphabet_size(eltype(sequence)))
+    count_kmers(sequence, [N,] K, T=Int, zeros=zeros)
 """
-function count_kmers(sequence, K::Integer, T::Type{<:Real}=Int, zeros=zeros; N::Integer = default_alphabet_size(eltype(sequence)))
-    return count_kmers!(KmerArray(N, K, T, zeros), sequence; reset=false)
-end
+count_kmers(sequence, ::Val{N}, ::Val{K}, T::Type{<:Real}=Int, zeros=zeros) where {N, K} = count_kmers!(KmerArray(N, K, T, zeros), sequence)
+count_kmers(sequence, N::Integer, K::Integer, args...) = count_kmers(sequence, Val(N), Val(K), args...)
+count_kmers(sequence, K::Integer, args...) = count_kmers(sequence, default_alphabet_size(eltype(sequence)), K, args...)
diff --git a/test/count.jl b/test/count.jl
@@ -7,7 +7,7 @@
     end
 
     @testset "count_kmers" begin
-        @test count_kmers([2, 0, 3, 3, 0, 1, 0], 1, N=4) == KmerArray([3, 1, 1, 2])
+        @test count_kmers([2, 0, 3, 3, 0, 1, 0], 4, 1) == KmerArray([3, 1, 1, 2])
     end
 
     @test_throws ErrorException VectorizedKmers.default_alphabet_size(String)