Small fixes

R/proc_reg.R

@@ -760,13 +760,14 @@ get_reg_report <- function(data, var, model, opts = NULL, weight = NULL, stats =
   rlbls[["UCLMSTD"]] <- sprintf(tlbls[["UCLMSTD"]], alph2)
   rlbls[["LCLMSTD"]] <- sprintf(tlbls[["LCLMSTD"]], alph2)
 
-  # Create
-  pfmt <- value(condition(is.na(x), "NA"),
+  # Create p-val format.
+  # Creating this from a string to bypass CMD check notes on unassigned variable x
+  pfmt <- eval(str2lang('value(condition(is.na(x), "NA"),
                 condition(x < .0001, "<.0001"),
                 condition(TRUE, "%.4f"),
-                log = FALSE)
+                log = FALSE)'))
 
-  reg_fc <- fcat(N = "%d", MEAN = "%.4f", STD = "%.4f", STDERR = "%.4f",
+  reg_fc <- fcat(N = "%d", MEAN = "%.4f", STD = "%.4f", STDERR = "%.5f",
                  MIN = "%.4f", MAX = "%.4f", UCLM = "%.4f", LCLM = "%.4f",
                  DF = "%d", "T" = "%.2f", PROBT = pfmt, NDF = "%.3f", DDF = "%.3f",
                  FVAL = "%.2f", PROBF = pfmt, UCLMSTD = "%.4f", LCLMSTD = "%.4f",

docs/pkgdown.yml

@@ -12,7 +12,7 @@ articles:
   procs-reg: procs-reg.html
   procs-ttest: procs-ttest.html
   procs: procs.html
-last_built: 2024-03-02T04:08Z
+last_built: 2024-03-03T02:01Z
 urls:
   reference: https://procs.r-sassy.org/reference
   article: https://procs.r-sassy.org/articles

tests/testthat/test-reg.R

@@ -229,6 +229,21 @@ test_that("reg7: by parameter works.", {
 
   expect_equal(length(res2), 2)
 
+
+  # Multiple Bys
+  res3 <- proc_reg(cls, myfm1,
+                   by = v(Sex, region),
+                   output = c("out", "report"))
+
+  res3
+
+  expect_equal(length(res3), 2)
+  expect_equal(is.data.frame(res3$out), TRUE)
+  expect_equal(nrow(res3$out), 4)
+  expect_equal(length(res3$report), 4)
+  expect_equal(length(res3$report$`MODEL1:Sex=F, region=A`), 4)
+
+
 })