removed subset from summary

chkiefer · chkiefer · commit aeded16be36a · 2023-10-23T15:08:27.000+02:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -32,5 +32,5 @@ Suggests:
     knitr,
     rmarkdown,
     testthat
+Encoding: UTF-8
 VignetteBuilder: knitr
-Encoding: UTF-8
diff --git a/R/00methods.R b/R/00methods.R
@@ -39,11 +39,9 @@ setMethod(
 
       # Print regression coefficients
       cat("Regression:\n")
-      res <- subset(
-        x = pt_g,
-        subset = dest == "beta" | dest == "gamma",
-        select = c("rhs", "par", "SE", "zval", "pval")
-      )
+      res_rows <- pt_g$dest == "beta" | pt_g$dest == "gamma"
+      res_cols <- c("rhs", "par", "SE", "zval", "pval")
+      res <- pt_g[res_rows, res_cols]
       rownames(res) <- res$rhs
       res <- res[, -1]
       names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
@@ -52,11 +50,9 @@ setMethod(
       if (family != "poisson") {
         # Print overdispersion parameter if it exists
         cat("\n")
-        res <- subset(
-          x = pt_g,
-          subset = dest == "overdis",
-          select = c("par", "SE", "zval", "pval")
-        )
+        res_rows <- pt_g$dest == "overdis"
+        res_cols <- c("par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- "Dispersion"
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
         print(res, digits = 3, print.gap = 3)
@@ -65,22 +61,19 @@ setMethod(
       if (no_z | no_lv) {
         # Print means and variances of the covariates
         cat("\nMeans:\n")
-        res <- subset(
-          x = pt_g,
-          subset = dest == "mu_z" | dest == "mu_eta",
-          select = c("lhs", "par", "SE", "zval", "pval")
-        )
+        res_rows <- pt_g$dest == "mu_z" | pt_g$dest == "mu_eta"
+        res_cols <- c("lhs", "par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- res$lhs
         res <- res[, -1]
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
         print(res, digits = 3, print.gap = 3)
 
         cat("\nVariances:\n")
-        res <- subset(
-          x = pt_g,
-          subset = type == "var" & (dest == "Sigma_z" | dest == "Sigma_eta"),
-          select = c("lhs", "par", "SE", "zval", "pval")
-        )
+        res_rows <- pt_g$type == "var" &
+          (pt_g$dest == "Sigma_z" | pt_g$dest == "Sigma_eta")
+        res_cols <- c("lhs", "par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- res$lhs
         res <- res[, -1]
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
@@ -90,12 +83,13 @@ setMethod(
       if (no_z + no_lv >= 2) {
         # Print covariances of covariates
         cat("\nCovariances:\n")
-        res <- subset(
-          x = pt_g,
-          subset = (type == "cov" &
-            (dest == "Sigma_z" | dest == "Sigma_eta")) | dest == "Sigma_z_lv",
-          select = c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
-        )
+        res_rows <- (
+          pt_g$type == "cov" &
+            (pt_g$dest == "Sigma_z" | pt_g$dest == "Sigma_eta")
+        ) |
+          pt_g$dest == "Sigma_z_lv"
+        res_cols <- c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- paste(res$lhs, res$op, res$rhs)
         res <- res[, -c(1:3)]
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
@@ -107,33 +101,27 @@ setMethod(
         cat("\nMeasurement Model:\n")
 
         cat("Intercepts:\n")
-        res <- subset(
-          x = pt_g,
-          subset = dest == "nu",
-          select = c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
-        )
+        res_rows <- pt_g$dest == "nu"
+        res_cols <- c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- paste(res$lhs, res$op, res$rhs)
         res <- res[, -c(1:3)]
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
         print(res, digits = 3, print.gap = 3)
 
         cat("\nLoadings:\n")
-        res <- subset(
-          x = pt_g,
-          subset = dest == "Lambda",
-          select = c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
-        )
+        res_rows <- pt_g$dest == "Lambda"
+        res_cols <- c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- paste(res$lhs, res$op, res$rhs)
         res <- res[, -c(1:3)]
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
         print(res, digits = 3, print.gap = 3)
 
         cat("\nResidual Variances:\n")
-        res <- subset(
-          x = pt_g,
-          subset = dest == "Theta" & type == "var",
-          select = c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
-        )
+        res_rows <- pt_g$dest == "Theta" & pt_g$type == "var"
+        res_cols <- c("lhs", "op", "rhs", "par", "SE", "zval", "pval")
+        res <- pt_g[res_rows, res_cols]
         rownames(res) <- paste(res$lhs, res$op, res$rhs)
         res <- res[, -c(1:3)]
         names(res) <- c("Estimate", "SE", "Est./SE", "p-value")
