removed degrees of freedom fron random + full permutation

karchjd · Mar 10, 2023 · 19d6168 · 19d6168
1 parent 209937a
commit 19d6168
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/R/bmtest.b.R b/R/bmtest.b.R
@@ -175,7 +175,7 @@ bmtestClass <- if (requireNamespace("jmvcore", quietly = TRUE)) {
                         extract_res <- function(res){
                             res_sel <- as.numeric(res$Analysis["id", ])
                             names(res_sel) <- colnames(res$Analysis)
-                            list(statistic = res_sel["Statistic"], parameter = "",
+                            list(statistic = res_sel["Statistic"],
                                  p.value = res_sel["p.value"], estimate = res_sel["Estimator"],
                                  conf.int = c(res_sel["Lower"], res_sel["Upper"]))
                         }
@@ -202,7 +202,6 @@ bmtestClass <- if (requireNamespace("jmvcore", quietly = TRUE)) {
                         suffix <- "[fullPerm]"
                         full_name <- "All Permutations"
                         extract_res <- function(res){
-                            res$parameter = ""
                             res
                         }
                         check_n <- TRUE
@@ -220,7 +219,9 @@ bmtestClass <- if (requireNamespace("jmvcore", quietly = TRUE)) {
                                         suffix)
                     if (!jmvcore::isError(res)) {
                         res <- extract_res(res)
-                        res  <- check_error_res(res)
+                        if(type == "asym"){
+                            res  <- check_error_res(res)
+                        }
                     }
                     if (!jmvcore::isError(res)) {
                         ests <- revert(res$estimate, res$conf.int[1], res$conf.int[2], HA)

diff --git a/R/bmtest.h.R b/R/bmtest.h.R
@@ -209,11 +209,6 @@ bmtestResults <- if (requireNamespace("jmvcore", quietly=TRUE)) R6::R6Class(
                         `title`="Statistic", 
                         `type`="number", 
                         `visible`="(randomPerm)"),
-                    list(
-                        `name`="df[randomPerm]", 
-                        `title`="df", 
-                        `type`="number", 
-                        `visible`="(randomPerm)"),
                     list(
                         `name`="p[randomPerm]", 
                         `title`="p", 
@@ -246,11 +241,6 @@ bmtestResults <- if (requireNamespace("jmvcore", quietly=TRUE)) R6::R6Class(
                         `title`="Statistic", 
                         `type`="number", 
                         `visible`="(fullPerm)"),
-                    list(
-                        `name`="df[fullPerm]", 
-                        `title`="df", 
-                        `type`="number", 
-                        `visible`="(fullPerm)"),
                     list(
                         `name`="p[fullPerm]", 
                         `title`="p", 

diff --git a/jamovi/bmtest.r.yaml b/jamovi/bmtest.r.yaml
@@ -83,12 +83,6 @@ items:
           visible: (randomPerm)
 
 
-        - name: df[randomPerm]
-          title: df
-          type: number
-          visible: (randomPerm)
-
-
         - name: p[randomPerm]
           title: p
           type: number
@@ -124,12 +118,6 @@ items:
           visible: (fullPerm)
 
 
-        - name: df[fullPerm]
-          title: df
-          type: number
-          visible: (fullPerm)
-
-
         - name: p[fullPerm]
           title: p
           type: number

diff --git a/tests/testthat/test-bmtest.R b/tests/testthat/test-bmtest.R
@@ -161,14 +161,12 @@ testthat::test_that('Formula Interface', {
         `ciu[asym]` = 0.747596,
         `test[randomPerm]` = "Random Permutations",
         `stat[randomPerm]` = 0.000,
-        `df[randomPerm]` = NA,
         `p[randomPerm]` = 0.654,
         `relEff[randomPerm]` = 0.500,
         `cil[randomPerm]` = 0.282,
         `ciu[randomPerm]` = 0.718,
         `test[fullPerm]` = "All Permutations",
         `stat[fullPerm]` = 0.000000,
-        `df[fullPerm]` = NA,
         `p[fullPerm]` = 1.000000000,
         `relEff[fullPerm]` = 0.500,
         check.names = FALSE