more fullrankx

JuliaStats · Mar 25, 2024 · 729dbcb · 729dbcb
1 parent 394135c
commit 729dbcb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Xymat.jl b/src/Xymat.jl
@@ -75,6 +75,8 @@ function fullrankx(A::FeTerm)
     return rnk == size(x, 2) ? x : view(x, :, 1:rnk)  # this handles the zero-columns case
 end
 
+fullrankx(m::MixedModel) = fullrankx(m.feterm)
+
 LinearAlgebra.rank(A::FeTerm) = A.rank
 
 """

diff --git a/src/generalizedlinearmixedmodel.jl b/src/generalizedlinearmixedmodel.jl
@@ -794,7 +794,7 @@ function updateη!(m::GeneralizedLinearMixedModel{T}) where {T}
     b = m.b
     u = m.u
     reterms = m.LMM.reterms
-    mul!(η, view(modelmatrix(m), :, 1:rank(m)), m.β)
+    mul!(η, fullrankx(m), m.β)
     for i in eachindex(b)
         mul!(η, reterms[i], vec(mul!(b[i], reterms[i].λ, u[i])), one(T), one(T))
     end

diff --git a/src/simulate.jl b/src/simulate.jl
@@ -271,7 +271,7 @@ function _simulate!(
     # add fixed-effects contribution
     # note that unit scaling may not be correct for
     # families with a dispersion parameter
-    mul!(η, view(lm.X, :, 1:(lm.feterm.rank)), β, one(T), one(T))
+    mul!(η, fullrankx(lm), β, one(T), one(T))
 
     μ = resp === nothing ? linkinv.(Link(m), η) : GLM.updateμ!(resp, η).mu
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,6 +75,8 @@ function fullrankx(A::FeTerm) @@
         return rnk == size(x, 2) ? x : view(x, :, 1:rnk)  # this handles the zero-columns case
     end
+    fullrankx(m::MixedModel) = fullrankx(m.feterm)
     LinearAlgebra.rank(A::FeTerm) = A.rank
     """
@@ Expand Down @@