test, minor changes

PharmCat · Oct 20, 2021 · 1ef2e71 · 1ef2e71 · PharmCat · Oct 21, 2021
1 parent a62ff0c
commit 1ef2e71
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/reml.jl b/src/reml.jl
@@ -25,6 +25,7 @@ function fillzeroutri!(a::AbstractArray{T})  where T
     tr = UpperTriangular(a)
     fill!(tr, zero(T))
 end
+#=
 function logerror!(e, lmm)
     if isa(e, DomainError)
         lmmlog!(lmm, LMMLogMsg(:ERROR, "DomainError ($(e.val), $(e.msg)) during REML calculation."))
@@ -40,6 +41,7 @@ function logerror!(e, lmm)
         lmmlog!(lmm, LMMLogMsg(:ERROR, "Unknown error during REML calculation."))
     end
 end
+=#
 ################################################################################
 #                     REML without provided β
 ################################################################################

diff --git a/src/rmat.jl b/src/rmat.jl
@@ -173,6 +173,7 @@ function rmatp_toephp!(mx, θ, rz, p)
     nothing
 end
 ################################################################################
+#=
  Base.@propagate_inbounds function edistance(i::AbstractVector{T1}, j::AbstractVector{T2}) where T1 where T2
     length(i) == length(j) || error("length i not equal j")
     sum = zero(promote_type(T1, T2))
@@ -181,8 +182,8 @@ end
     end
     return sqrt(sum)
 end
-
-function edistance(mx::AbstractMatrix{T}, i::Int, j::Int) where T
+=#
+Base.@propagate_inbounds function edistance(mx::AbstractMatrix{T}, i::Int, j::Int) where T
     sum = zero(T)
     for c = 1:size(mx, 2)
         sum += (mx[i,c] - mx[j,c])^2

diff --git a/test/test.jl b/test/test.jl
@@ -89,6 +89,8 @@ include("testdata.jl")
     @test t3table.pval[4]          ≈ 0.7852154468081014 atol=1E-6
     ct = Metida.contrast(lmm, [0 0 1 0 0 0; 0 0 0 1 0 0; 0 0 0 0 1 0])
     @test t3table.pval[3] ≈ ct.pval[1]
+    est = Metida.estimate(lmm, [0,0,0,0,0,1]; level = 0.9)
+    @test_nowarn Base.show(io, est)
     ############################################################################
     # AI like algo
     Metida.fit!(lmm; aifirst = true, init = Metida.theta(lmm))