make zerocorr!(mod) mark the model as unfitted (#251)

* make zerocorr!(mod) marks the model as unfitted

* tests for preserved vals

* simplify zeroing out of non-diagonal entries

Author: palday

src/linearmixedmodel.jl

@@ -869,7 +869,7 @@ function zerocorr!(m::LinearMixedModel{T}, trmns) where {T}
     optsum.initial_step = T[]
 
     # the model is no longer fitted
-    optsum.feval == -1
+    optsum.feval = -1
 
     m
 end

src/remat.jl

@@ -550,9 +550,7 @@ vsize(A::ReMat{T,S}) where {T,S} = S
 function zerocorr!(A::ReMat{T}) where {T}
     λ = A.λ
     A.inds = intersect(A.inds, diagind(λ))
-    fill!(λ.data, 0)
-    for i in A.inds
-        λ.data[i] = 1
-    end
+    # zero out all entries not on the diagonal
+    λ[setdiff(A.inds, diagind(λ))] .= 0
     A
 end

test/pls.jl

@@ -220,7 +220,13 @@ end
 
     simulate!(fm)  # to test one of the unscaledre methods
 
-    fmnc = zerocorr!(LinearMixedModel(@formula(reaction ~ 1+days+ (1+days|subj)), slp))
+    fmnc = zerocorr!(deepcopy(fm))
+    @test fmnc.optsum.feval < 0
+    @test size(fmnc) == (180,2,36,1)
+    @test fmnc.θ == [fm.θ[1], fm.θ[3]]
+    @test lowerbd(fmnc) == zeros(2)
+
+    fmnc = zerocorr!(LMM(@formula(reaction ~ 1 + days + (1+days|subj)), slp));
     @test size(fmnc) == (180,2,36,1)
     @test fmnc.θ == ones(2)
     @test lowerbd(fmnc) == zeros(2)