Merge pull request #62 from rcalinjageman/development

1.0.5 to fix negative values issue with estimate_mdiff_paired
rcalinjageman · Sep 23, 2024 · c66f363 · c66f363
2 parents 91494cb + ab679a1
commit c66f363
Show file tree

Hide file tree

Showing 122 changed files with 202 additions and 129 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 1.0.4
+Version: 1.0.5
 Date: 2024-09-11 00:48:54 UTC
 SHA: 4484803ae42ad9d0ccff8db6a965aafe2893ea2a
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: esci
 Type: Package
 Title: Estimation Statistics with Confidence Intervals
-Version: 1.0.4
+Version: 1.0.5
 Authors@R: person("Robert", "Calin-Jageman", email = "[email protected]",
   role = c("aut", "cre", "cph"))
 Description: A collection of functions and 'jamovi' module for the estimation approach to inferential statistics, the approach which emphasizes effect sizes, interval estimates, and meta-analysis. Nearly all functions are based on 'statpsych' and 'metafor'.  This package is still under active development, and breaking changes are likely, especially with the plot and hypothesis test functions.  Data sets are included for all examples from Cumming & Calin-Jageman (2024) <ISBN:9780367531508>.
@@ -36,4 +36,4 @@ Suggests:
     testthat (>= 3.0.0)
 Config/testthat/edition: 3
 Depends: 
-    R (>= 2.10)
+    R (>= 2.10)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,12 @@
+esci version 1.0.5 (Release data: September 2024)
+===========
+
+Changes:
+
+* Fixed bug in estimate_mdiff_paired where negative
+values where causing an error due to changes in statpsych ci.ratio.median.ps
+
+
 esci version 1.0.4 (Release data: September 2024)
 ===========
 

diff --git a/R/statpsych_wrapper.R b/R/statpsych_wrapper.R
@@ -306,7 +306,7 @@ wrapper_ci_ratio.2 <- function(
     statpsych_cols <- c("Mean1/Mean2", "LL", "UL", "Mean1", "Mean2")
     esci_cols <- c("effect_size", "LL", "UL", "comparison_mean", "reference_mean")
   } else if (mean_or_median == "median") {
-    es_ration <- data.frame("Median1" = NA, "Median2" = NA, "Median1/Median2" = NA, "LL" = NA, "UL" = NA)
+    es_ratio <- data.frame("Median1" = NA, "Median2" = NA, "Median1/Median2" = NA, "LL" = NA, "UL" = NA, check.names = FALSE)
 
     if (all(comparison_measure >= 0) & all(reference_measure >= 0)) {
       es_ratio <- as.data.frame(
@@ -369,13 +369,19 @@ wrapper_ci_ratio.ps <- function(
     statpsych_cols <- c("Mean1/Mean2", "LL", "UL", "Mean1", "Mean2")
     esci_cols <- c("effect_size", "LL", "UL", "comparison_mean", "reference_mean")
   } else if (mean_or_median == "median") {
-    es_ratio <- as.data.frame(
-      statpsych::ci.ratio.median.ps(
-        alpha = 1 - conf_level,
-        y1 = comparison_measure,
-        y2 = reference_measure
+
+    es_ratio <- data.frame("Median1" = NA, "Median2" = NA, "Median1/Median2" = NA, "LL" = NA, "UL" = NA, check.names = FALSE)
+
+    if (all(comparison_measure >= 0) & all(reference_measure >= 0)) {
+      es_ratio <- as.data.frame(
+        statpsych::ci.ratio.median.ps(
+          alpha = 1 - conf_level,
+          y1 = comparison_measure,
+          y2 = reference_measure
+        )
       )
-    )
+    }
+
     statpsych_cols <- c("Median1/Median2", "LL", "UL", "Median1", "Median2")
     esci_cols <- c("effect_size", "LL", "UL", "comparison_median", "reference_median")
   } else {

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -2,7 +2,7 @@ pandoc: 3.1.11
 pkgdown: 2.1.0
 pkgdown_sha: ~
 articles: {}
-last_built: 2024-09-12T14:10Z
+last_built: 2024-09-23T17:57Z
 urls:
   reference: https://rcalinjageman.github.io/esci/reference
   article: https://rcalinjageman.github.io/esci/articles
diff --git a/docs/reference/CI_diamond_ratio.html b/docs/reference/CI_diamond_ratio.html
diff --git a/docs/reference/CI_smd_ind_contrast.html b/docs/reference/CI_smd_ind_contrast.html
diff --git a/docs/reference/CI_smd_one.html b/docs/reference/CI_smd_one.html
diff --git a/docs/reference/data_altruism_happiness.html b/docs/reference/data_altruism_happiness.html
diff --git a/docs/reference/data_anchor_estimate_ma.html b/docs/reference/data_anchor_estimate_ma.html
diff --git a/docs/reference/data_basol_badnews.html b/docs/reference/data_basol_badnews.html
diff --git a/docs/reference/data_bem_psychic.html b/docs/reference/data_bem_psychic.html
diff --git a/docs/reference/data_bodywellf.html b/docs/reference/data_bodywellf.html
diff --git a/docs/reference/data_bodywellfm.html b/docs/reference/data_bodywellfm.html
diff --git a/docs/reference/data_bodywellm.html b/docs/reference/data_bodywellm.html
diff --git a/docs/reference/data_campus_involvement.html b/docs/reference/data_campus_involvement.html
diff --git a/docs/reference/data_chap_8_paired_ex_8.18.html b/docs/reference/data_chap_8_paired_ex_8.18.html
diff --git a/docs/reference/data_clean_moral.html b/docs/reference/data_clean_moral.html
diff --git a/docs/reference/data_college_survey_1.html b/docs/reference/data_college_survey_1.html
diff --git a/docs/reference/data_college_survey_2.html b/docs/reference/data_college_survey_2.html
diff --git a/docs/reference/data_damischrcj.html b/docs/reference/data_damischrcj.html
diff --git a/docs/reference/data_effronraj_fakenews.html b/docs/reference/data_effronraj_fakenews.html
diff --git a/docs/reference/data_emotion_heartrate.html b/docs/reference/data_emotion_heartrate.html
diff --git a/docs/reference/data_exam_scores.html b/docs/reference/data_exam_scores.html
diff --git a/docs/reference/data_flag_priming_ma.html b/docs/reference/data_flag_priming_ma.html
diff --git a/docs/reference/data_gender_math_iat.html b/docs/reference/data_gender_math_iat.html
diff --git a/docs/reference/data_gender_math_iat_ma.html b/docs/reference/data_gender_math_iat_ma.html
diff --git a/docs/reference/data_halagappa.html b/docs/reference/data_halagappa.html