Merge pull request #31 from PharmCat/dev14

double func
PharmCat · Dec 29, 2022 · c475b5c · c475b5c · PharmCat · Dec 30, 2022
2 parents 70b675d + f1d3f27
commit c475b5c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/fit.jl b/src/fit.jl
@@ -157,8 +157,8 @@ function fit!(lmm::LMM{T}; kwargs...) where T
     varlinkrvecapply!(θ, lmm.covstr.ct; varlinkf = varlinkf, rholinkf = rholinkf)
 
     # Twice differentiable object / reml_sweep_β_nlopt
-    vloptf(x)  = reml_sweep_β(lmm, lmm.dv, varlinkvecapply(x, lmm.covstr.ct; varlinkf = varlinkf, rholinkf = rholinkf); maxthreads = maxthreads)[1]
-    vloptfd(x) = reml_sweep_β_nlopt(lmm, lmm.dv, varlinkvecapply(x, lmm.covstr.ct; varlinkf = varlinkf, rholinkf = rholinkf); maxthreads = maxthreads)[1]
+    vloptf(x)  = reml_sweep_β(lmm, lmm.dv, varlinkvecapply!(x, lmm.covstr.ct; varlinkf = varlinkf, rholinkf = rholinkf); maxthreads = maxthreads)[1]
+    vloptfd(x) = reml_sweep_β_nlopt(lmm, lmm.dv, varlinkvecapply!(x, lmm.covstr.ct; varlinkf = varlinkf, rholinkf = rholinkf); maxthreads = maxthreads)[1]
 
     gcfg   = ForwardDiff.GradientConfig(vloptf, θ, chunk)
     hcfg   = ForwardDiff.HessianConfig(vloptf, θ, chunk)

diff --git a/src/lmm.jl b/src/lmm.jl
@@ -117,19 +117,6 @@ function coefn(lmm)
     length(lmm.result.beta)
 end
 
-tname(t::AbstractTerm) = "$(t.sym)"
-tname(t::InteractionTerm) = join(tname.(t.terms), " & ")
-tname(t::InterceptTerm) = "(Intercept)"
-function tname(t::FunctionTerm) 
-    args = string(t.args_parsed[1])
-    if length(t.args_parsed) > 1
-        for i = 2:length(t.args_parsed)
-            args *= ", "*string(t.args_parsed[i])
-        end
-    end
-    string(t.forig)*"("*args*")"
-end
-
 """
     theta(lmm::LMM)
 

diff --git a/src/utils.jl b/src/utils.jl
@@ -26,9 +26,24 @@ function nterms(rhs::Union{Tuple{Vararg{AbstractTerm}}, Nothing, AbstractTerm})
     end
     p
 end
+
+"""
+    Rerm name.
+"""
 tname(t::AbstractTerm) = "$(t.sym)"
 tname(t::InteractionTerm) = join(tname.(t.terms), " & ")
 tname(t::InterceptTerm) = "(Intercept)"
+function tname(t::FunctionTerm) 
+    args = string(t.args_parsed[1])
+    if length(t.args_parsed) > 1
+        for i = 2:length(t.args_parsed)
+            args *= ", "*string(t.args_parsed[i])
+        end
+    end
+    string(t.forig)*"("*args*")"
+end
+
+
 """
     lcontrast(lmm::LMM, i::Int)