Skip to content

Commit 679ff36

Browse files
committed
display() and paired t-test output
Fixes #1085
1 parent de9f0c3 commit 679ff36

File tree

4 files changed

+44
-9
lines changed

4 files changed

+44
-9
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: parameters
33
Title: Processing of Model Parameters
4-
Version: 0.24.2.13
4+
Version: 0.24.2.14
55
Authors@R:
66
c(person(given = "Daniel",
77
family = "Lüdecke",

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
* `model_parameters()` now shows a more informative coefficient name for binomial
1010
models with probit-link.
1111

12+
## Bug fixes
13+
14+
* Fixed printing issue with `model_parameters()` for `htest` objects when
15+
printing into markdown or HTMP format.
16+
1217
# parameters 0.24.2
1318

1419
## Changes

R/format.R

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,17 @@ format.parameters_model <- function(x,
9797
colnames(x)[which(colnames(x) == "Mean_Group2")] <- paste0(x$Group, " = ", mean_group_values[2])
9898
}
9999

100+
# for htests, remove "$" from variable name, since this can make troubles
101+
# when rendering into different output formats
102+
if (!is.null(htest_type)) {
103+
if (grepl("$", x$Parameter, fixed = TRUE)) {
104+
x$Parameter <- gsub("(.*)\\$(.*)", "\\2", x$Parameter)
105+
}
106+
if (grepl("$", x$Group, fixed = TRUE)) {
107+
x$Group <- gsub("(.*)\\$(.*)", "\\2", x$Group)
108+
}
109+
}
110+
100111
# Special print for mcp from WRS2
101112
if (!is.null(m_class) && any(m_class %in% c("mcp1", "mcp2"))) {
102113
x$Group1 <- paste(x$Group1, x$Group2, sep = " vs. ")

R/methods_htest.R

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,17 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
178178

179179
#' @keywords internal
180180
.extract_htest_boxpierce <- function(model) {
181-
data.frame(
181+
out <- data.frame(
182182
Parameter = model$data.name,
183183
Chi2 = model$statistic,
184184
df_error = model$parameter,
185185
p = model$p.value,
186186
Method = model$method,
187187
stringsAsFactors = FALSE
188188
)
189+
190+
attr(out, "htest_type") <- "boxpiercetest"
191+
out
189192
}
190193

191194

@@ -232,6 +235,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
232235
)
233236

234237
out <- out[col_order[col_order %in% names(out)]]
238+
attr(out, "htest_type") <- "cortest"
235239
out
236240
}
237241

@@ -283,6 +287,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
283287
out$Method <- model$method
284288
}
285289

290+
attr(out, "htest_type") <- "ranktest"
286291
out
287292
}
288293

@@ -291,22 +296,25 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
291296

292297
#' @keywords internal
293298
.extract_htest_levenetest <- function(model) {
294-
data.frame(
299+
out <- data.frame(
295300
df = model$Df[1],
296301
df_error = model$Df[2],
297302
`F` = model$`F value`[1], # nolint
298303
p = model$`Pr(>F)`[1],
299304
Method = "Levene's Test for Homogeneity of Variance",
300305
stringsAsFactors = FALSE
301306
)
307+
308+
attr(out, "htest_type") <- "levenetest"
309+
out
302310
}
303311

304312

305313
# extract htest var.test ----------------------
306314

307315
#' @keywords internal
308316
.extract_htest_vartest <- function(model) {
309-
data.frame(
317+
out <- data.frame(
310318
Parameter = model$data.name,
311319
Estimate = model$estimate,
312320
df = model$parameter[1],
@@ -318,6 +326,9 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
318326
Method = "F test to compare two variances",
319327
stringsAsFactors = FALSE
320328
)
329+
330+
attr(out, "htest_type") <- "vartest"
331+
out
321332
}
322333

323334

@@ -433,14 +444,17 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
433444

434445
#' @keywords internal
435446
.extract_htest_oneway <- function(model) {
436-
data.frame(
447+
out <- data.frame(
437448
`F` = model$statistic, # nolint
438449
df = model$parameter[1],
439450
df_error = model$parameter[2],
440451
p = model$p.value,
441452
Method = model$method,
442453
stringsAsFactors = FALSE
443454
)
455+
456+
attr(out, "htest_type") <- "onewaytest"
457+
out
444458
}
445459

446460

@@ -455,7 +469,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
455469
model$method <- gsub("(Pearson's X\\^2: )(.*)", "Pearson's Chi2 \\(\\2\\)", model$method)
456470
}
457471
if (names(model$statistic) == "F") {
458-
data.frame(
472+
out <- data.frame(
459473
`F` = model$statistic, # nolint
460474
df = model$parameter[1],
461475
df_error = model$parameter[2],
@@ -464,7 +478,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
464478
stringsAsFactors = FALSE
465479
)
466480
} else {
467-
data.frame(
481+
out <- data.frame(
468482
Chi2 = model$statistic,
469483
df = model$parameter,
470484
p = model$p.value,
@@ -473,7 +487,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
473487
)
474488
}
475489
} else if (!is.null(model$estimate) && identical(names(model$estimate), "odds ratio")) {
476-
data.frame(
490+
out <- data.frame(
477491
`Odds Ratio` = model$estimate,
478492
# CI = attributes(model$conf.int)$conf.level,
479493
CI_low = model$conf.int[1],
@@ -484,14 +498,17 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
484498
check.names = FALSE
485499
)
486500
} else {
487-
data.frame(
501+
out <- data.frame(
488502
Chi2 = model$statistic,
489503
df = model$parameter,
490504
p = model$p.value,
491505
Method = model$method,
492506
stringsAsFactors = FALSE
493507
)
494508
}
509+
510+
attr(out, "htest_type") <- "chi2test"
511+
out
495512
}
496513

497514

@@ -518,6 +535,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
518535
out$Null_value <- model$null.value
519536
out$p <- model$p.value
520537
out$Method <- model$method
538+
attr(out, "htest_type") <- "proptest"
521539
out
522540
}
523541

@@ -537,6 +555,7 @@ model_parameters.svytable <- function(model, verbose = TRUE, ...) {
537555
out$Null_value <- model$null.value
538556
out$p <- model$p.value
539557
out$Method <- model$method
558+
attr(out, "htest_type") <- "binomtest"
540559
out
541560
}
542561

0 commit comments

Comments
 (0)