add more tests

src/IO.jl

@@ -22,7 +22,7 @@ export writelines
 
 ! `x` 需要是string，不然文件错误
 """
-function writelines(x::AbstractVector{<:AbstractString}, f; mode="w", eof="\n")
+function writelines(x::AbstractVector{<:AbstractString}, f::AbstractString; mode="w", eof="\n")
   fid = open(f, mode)
   @inbounds for _x in x
     write(fid, _x)
@@ -31,7 +31,7 @@ function writelines(x::AbstractVector{<:AbstractString}, f; mode="w", eof="\n")
   close(fid)
 end
 
-function writelines(x::AbstractString, f; mode="w", eof="\n")
+function writelines(x::AbstractString, f::AbstractString; mode="w", eof="\n")
   fid = open(f, mode)
   write(fid, x)
   write(fid, eof)

src/Statistics/match2.jl

@@ -1,5 +1,11 @@
 # import StatsBase: countmap
 # table = countmap
+function dict2order(dict; rev=true)
+  _keys = keys(dict) |> collect
+  _values = values(dict) |> collect
+  inds = sortperm(_values; rev)
+  OrderedDict(_keys[i] => _values[i] for i in inds)
+end
 
 """
   table(x::AbstractVector)
@@ -8,7 +14,7 @@
 This function is about 5X slower than `StatsBase: countmap`.
 If speed matters for you, use `StatsBase.countmap` instead.
 """
-function table(x::AbstractVector)
+function table(x::AbstractVector; rev=true)
   tbl = Dict{eltype(x),Int}()
   for element in x
     if haskey(tbl, element)
@@ -17,7 +23,7 @@ function table(x::AbstractVector)
       tbl[element] = 1
     end
   end
-  return tbl
+  return dict2order(tbl; rev)
 end
 
 

src/r_base.jl

@@ -1,4 +1,5 @@
 import DataStructures: OrderedDict
+export OrderedDict
 # using LoopVectorization: @turbo
 
 # function r_in(x::AbstractVector, y::AbstractVector)::BitVector

test/test-Ipaper.jl

@@ -87,5 +87,18 @@ end
   str = ["a", "b"]
   writelines(str, f)
   @test readlines(f) == str
+
+  writelines("Hello world", f)
+  @test readlines("a.txt")[1] == "Hello world"
   rm(f)
 end
+
+@testset "table" begin
+  tbl = table([2, 2, 2, 1, 1, 1, 1]; rev=true)
+  @test collect(values(tbl)) == [4, 3]
+
+  tbl = table([2, 2, 2, 1, 1, 1, 1]; rev=false)
+  @test collect(values(tbl)) == [3, 4]
+end
+
+

test/test-stat_weighted.jl

@@ -24,7 +24,15 @@ end
 @testset "weighted_nansum" begin
   x = [1.0, NaN, 3]
   A = reshape(x, 1, 1, 3)
-  weighted_nansum([1.0, 2, 3], [1, 1, 1]) == 6.0
-  weighted_nansum(x, [1, 1, 1]) == 4.0
-  weighted_nansum(A, [1, 1, 1])[1] == 4.0
+  @test weighted_nansum([1.0, 2, 3], [1, 1, 1]) == 6.0
+  @test weighted_nansum(x, [1, 1, 1]) == 4.0
+  @test weighted_nansum(A, [1, 1, 1])[1] == 4.0
+end
+
+@testset "weighted_nansum" begin
+  x = [1.0, NaN, 3]
+  A = reshape(x, 1, 1, 3)
+  @test weighted_nanmean([1.0, 2, 3], [1, 1, 1]) == 2.0
+  @test weighted_nanmean(x, [1, 1, 1]) == 2.0
+  # weighted_nanmean(A, [1, 1, 1])[1] == 4.0
 end