bug

fate-ewi · Aug 29, 2020 · a45e802 · a45e802
1 parent 2d3dbdd
commit a45e802
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/R/fit_dfa.R b/R/fit_dfa.R
@@ -339,10 +339,6 @@ fit_dfa <- function(y = y,
 
   if(is.null(par_list)) {
     pars <- c("x", "Z", "sigma", "log_lik", "psi","xstar")
-  } else {
-    if(par_list == "all") pars <- c("x", "Z", "sigma", "log_lik", "psi","xstar",
-      "devs","x0","z","zpos","sigma_process","p_z",
-      "b_obs","b_pro","phi","theta","Lcorr","ymiss","nu") # removed pred
   }
   if (est_correlation) pars <- c(pars, "Omega", "Sigma") # add correlation matrix
   if (estimate_nu) pars <- c(pars, "nu")
@@ -352,6 +348,14 @@ fit_dfa <- function(y = y,
   if(!is.null(pro_covar)) pars <- c(pars, "b_pro")
   if(est_sigma_process) pars <- c(pars, "sigma_process")
 
+  if(!is.null(par_list)) {
+    if(par_list=="all") {
+    pars <- pars <- c("x", "Z", "sigma", "log_lik", "psi","xstar",
+      "devs","x0","z","zpos","sigma_process","p_z",
+      "b_obs","b_pro","phi","theta","Lcorr","ymiss","nu") # removed pred
+    }
+  }
+
   sampling_args <- list(
     object = stanmodels$dfa,
     data = data_list,