add undocumented inlet

philchalmers · Dec 13, 2024 · 6213d74 · 6213d74
1 parent 8e3ea08
commit 6213d74
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/R/03-estimation.R b/R/03-estimation.R
@@ -701,7 +701,7 @@ ESTIMATION <- function(data, model, group, itemtype = NULL, guess = 0, upper = 1
                                          keep_vcov_PD=opts$keep_vcov_PD, symmetric=opts$technical$symmetric,
                                          MCEM_draws=opts$MCEM_draws, omp_threads=opts$omp_threads),
                              Theta=Theta, DERIV=DERIV, solnp_args=opts$solnp_args, control=control,
-                             nconstrain=opts$technical$nconstrain)
+                             nconstrain=opts$technical$nconstrain, fixedEtable=opts$technical$fixedEtable)
         if(opts$method == 'MCEM')
             opts$quadpts <- opts$MCEM_draws(ESTIMATE$cycles)
         opts$Moptim <- ESTIMATE$Moptim
@@ -1132,8 +1132,10 @@ ESTIMATION <- function(data, model, group, itemtype = NULL, guess = 0, upper = 1
             Internals$thetaPosterior <- tmp
         }
     }
-    if(opts$storeEtable)
+    if(opts$storeEtable){
         Internals$Etable <- ESTIMATE$Etable
+        Internals$Theta <- Theta
+    }
     if(opts$storeEMhistory)
         Internals$EMhistory <- ESTIMATE$EMhistory
     if(opts$method == 'SEM') Options$TOL <- NA

diff --git a/R/EMstep.group.R b/R/EMstep.group.R
@@ -1,5 +1,5 @@
 EM.group <- function(pars, constrain, Ls, Data, PrepList, list, Theta, DERIV, solnp_args, control,
-                     nconstrain=NULL)
+                     nconstrain=NULL, fixedEtable=NULL)
 {
     verbose <- list$verbose
     lrPars <- list$lrPars
@@ -251,6 +251,8 @@ EM.group <- function(pars, constrain, Ls, Data, PrepList, list, Theta, DERIV, so
                            ngroups=ngroups, itemloc=itemloc, CUSTOM.IND=CUSTOM.IND,
                            dentype=dentype, rlist=rlist, full=full, Etable=list$Etable,
                            omp_threads=list$omp_threads)
+            if(!is.null(fixedEtable))
+                Elist$rlist[[1]]$r1 <- fixedEtable
             rlist <- Elist$rlist; LL <- Elist$LL
             if(any(ANY.PRIOR)){
                 LP <- 0

diff --git a/R/utils.R b/R/utils.R
@@ -1640,7 +1640,7 @@ makeopts <- function(method = 'MHRM', draws = 2000L, calcLL = TRUE, quadpts = NU
                 'internal_constraints', 'SEM_window', 'delta', 'MHRM_SE_draws', 'Etable', 'infoAsVcov',
                 'PLCI', 'plausible.draws', 'storeEtable', 'keep_vcov_PD', 'Norder', 'MCEM_draws',
                 "zeroExtreme", 'mins', 'info_if_converged', 'logLik_if_converged', 'omp', 'nconstrain',
-                'standardize_ref', "storeEMhistory")
+                'standardize_ref', "storeEMhistory", 'fixedEtable')
     if(!all(tnames %in% gnames))
         stop('The following inputs to technical are invalid: ',
              paste0(tnames[!(tnames %in% gnames)], ' '), call.=FALSE)