version 0.2.5

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: pairwiseComparisons
 Title: Multiple Pairwise Comparison Tests
-Version: 0.2.0
+Version: 0.2.5
 Authors@R: 
     person(given = "Indrajeet",
            family = "Patil",
@@ -21,18 +21,18 @@ URL: https://indrajeetpatil.github.io/pairwiseComparisons/,
         https://github.com/IndrajeetPatil/pairwiseComparisons
 BugReports: https://github.com/IndrajeetPatil/pairwiseComparisons/issues
 Depends: R (>= 3.5.0)
-Imports: broomExtra (>= 1.0.1), dplyr (>= 0.8.3), forcats (>= 0.4.0),
-        jmv (>= 1.0.8), purrr (>= 0.3.3), rlang (>= 0.4.2), stats,
-        tibble (>= 2.1.3), tidyr (>= 1.0.0), utils, WRS2 (>= 1.0-0)
+Imports: dplyr (>= 0.8.3), forcats (>= 0.4.0), ipmisc (>= 1.0.0), jmv
+        (>= 1.0.8), purrr (>= 0.3.3), rlang (>= 0.4.2), stats, tibble
+        (>= 2.1.3), tidyr (>= 1.0.0), utils, WRS2 (>= 1.0-0)
 Suggests: ggplot2, knitr, rmarkdown, spelling, testthat
+VignetteBuilder: knitr
 Encoding: UTF-8
 Language: en-US
 LazyData: true
 RoxygenNote: 7.0.2.9000
-VignetteBuilder: knitr
 NeedsCompilation: no
-Packaged: 2020-02-02 15:54:47 UTC; inp099
+Packaged: 2020-02-11 10:01:14 UTC; inp099
 Author: Indrajeet Patil [cre, aut, ctb]
     (<https://orcid.org/0000-0003-1995-6531>)
 Repository: CRAN
-Date/Publication: 2020-02-02 17:10:02 UTC
+Date/Publication: 2020-02-11 10:50:05 UTC

MD5

@@ -1,41 +1,36 @@
-00e95b71cf8f8753597e9d0dc556f25e *DESCRIPTION
+b6001b1bd815b6be273df2bccb0e8145 *DESCRIPTION
 882a34304fbad2094a2e16309dd9884b *LICENSE
-228bcc5e5517c63107cd310076a3a2c0 *NAMESPACE
-833975a12e667ba6cdea08e96ed09941 *NEWS.md
+ffa11a0afb6a2b9c6cad4997776b8e25 *NAMESPACE
+3fe2c425782c8d0c89a7a63c3fb6ea68 *NEWS.md
 d9357fdd647f95d859ecbece69c14ffc *R/data.R
 41cce59cf24afbe39d74520d97199b5d *R/games_howell.R
 6417910da652d6def85b1252c1585e5f *R/global_vars.R
 3b6655b7f1e986ab89899efe5c2a4cdc *R/helpers.R
-c8731d62580ba9a4f938d2d4ef725c17 *R/pairwise_comparisons.R
-12cbcce4cd043ac20d10bc49af101f14 *R/reexports.R
-0d6a33ad352411b3bd546b2e5bca4903 *R/utils_formatting.R
-d9907737db3d4fa239926548a150c5b4 *README.md
+b6e766fdb516a4dab9ee42a2eb8fd269 *R/pairwise_comparisons.R
+99952889fb698a88d606944dadc919c5 *R/reexports.R
+c398f6440b33742c7fc620d8219e681c *README.md
 6c2c9f2a0966cde515a4643031a7794a *build/vignette.rds
 60e0e78acc2c42531f52352f480329c2 *data/bugs_long.rdata
 c5ee4fa2f5ea32bdf87e02ea71a415f8 *data/iris_long.rdata
 91069babfae39db7b08f35ede31084f2 *data/movies_long.rdata
 54a342a94ac6e4232913e999a95d4e94 *data/movies_wide.rdata
 2664a73ea8c7701c767239b0613dc913 *inst/CITATION
-00b115d0178e67a991c8b5c2a5518021 *inst/WORDLIST
+7f7065e85cc50fbb25724d5f23c55314 *inst/WORDLIST
 b1c9f27501a05a6f9a3e86336c1f2185 *inst/doc/tests_and_coverage.R
-9673e65079f6cee951fb4a561a37a53b *inst/doc/tests_and_coverage.Rmd
-7e639d87364661a10465b8d92a7a8e53 *inst/doc/tests_and_coverage.html
+4e988b80cd3e2c79b47160e656d1e2da *inst/doc/tests_and_coverage.Rmd
+a2107175f9d5a58a697d9a6909da0864 *inst/doc/tests_and_coverage.html
 4fb14e7f02a938657cfc9eba6e5f9b87 *man/bugs_long.Rd
 3eeeef10beffd25cb2d0aea4da47365e *man/figures/README-ggisignif-1.png
 995c704e147f20fdf578e2608b4319f5 *man/games_howell.Rd
 cef12ce66aa49de46d5bb1fff445edd3 *man/iris_long.Rd
-ecfc8d19c87b330d1386167b46b7aba3 *man/long_to_wide_converter.Rd
 2e79a6d0d157cd44a43fffa1f8f06667 *man/movies_long.Rd
 71b99a06a95d50f392a11cde0bf86ca1 *man/movies_wide.Rd
 17f53cd27a1d10477dd1ba397db81c34 *man/p_adjust_text.Rd
 979dad473414faea822332e3b4659dd3 *man/pairwise_comparisons.Rd
-73fc4851ff7e4acdedd877d583ef0b64 *man/reexports.Rd
-dcca00063aa9ba6ed11e0521756a5e35 *man/signif_column.Rd
-fb674c737e69756bda1032ee311065b4 *man/specify_decimal_p.Rd
-b34d7af73c35663ec08ab995d4349a0a *tests/README.md
+e10bf88a87a64d5b1a5147b2b94ee4df *man/reexports.Rd
+4393414902910ca83ac7faf83be60afb *tests/README.md
 dbd9bab057163c01c320d0b9d3bb9620 *tests/spelling.R
 ac503b90bd70b6f265dc58b04d55fec1 *tests/testthat.R
-ebff2090519b7ec7860f1686fb17afd7 *tests/testthat/test-long_to_wide_converter.R
 1422eb72ca1f0e1dee7a93204cfa5444 *tests/testthat/test-pairwise_comparisons.R
 c0839d4c280d16c54f3945228a7eb5df *tests/testthat/test-switch_statements.R
-9673e65079f6cee951fb4a561a37a53b *vignettes/tests_and_coverage.Rmd
+4e988b80cd3e2c79b47160e656d1e2da *vignettes/tests_and_coverage.Rmd

NAMESPACE

@@ -1,11 +1,13 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%$%")
+export("%<-%")
 export("%<>%")
 export("%>%")
 export("%|%")
 export("%||%")
 export(as_tibble)
+export(long_to_wide_converter)
 export(p_adjust_text)
 export(pairwise_comparisons)
 export(pairwise_p)
@@ -14,30 +16,25 @@ export(specify_decimal_p)
 export(tibble)
 importFrom(WRS2,lincon)
 importFrom(WRS2,rmmcp)
-importFrom(broomExtra,"%$%")
-importFrom(broomExtra,"%<>%")
-importFrom(broomExtra,"%>%")
-importFrom(dplyr,arrange)
 importFrom(dplyr,everything)
 importFrom(dplyr,full_join)
-importFrom(dplyr,group_by)
 importFrom(dplyr,group_nest)
 importFrom(dplyr,mutate)
-importFrom(dplyr,mutate_at)
 importFrom(dplyr,mutate_if)
-importFrom(dplyr,n)
-importFrom(dplyr,pull)
 importFrom(dplyr,rename)
-importFrom(dplyr,row_number)
 importFrom(dplyr,select)
-importFrom(dplyr,summarize)
-importFrom(dplyr,ungroup)
 importFrom(dplyr,vars)
 importFrom(forcats,fct_relabel)
+importFrom(ipmisc,"%$%")
+importFrom(ipmisc,"%<-%")
+importFrom(ipmisc,"%<>%")
+importFrom(ipmisc,"%>%")
+importFrom(ipmisc,long_to_wide_converter)
+importFrom(ipmisc,signif_column)
+importFrom(ipmisc,specify_decimal_p)
 importFrom(jmv,anovaNP)
 importFrom(jmv,anovaRMNP)
 importFrom(purrr,map)
-importFrom(rlang,"!!!")
 importFrom(rlang,"!!")
 importFrom(rlang,"%|%")
 importFrom(rlang,"%||%")
@@ -47,7 +44,6 @@ importFrom(rlang,enquo)
 importFrom(rlang,ensym)
 importFrom(stats,TukeyHSD)
 importFrom(stats,aov)
-importFrom(stats,lm)
 importFrom(stats,na.omit)
 importFrom(stats,p.adjust)
 importFrom(stats,pairwise.t.test)

NEWS.md

@@ -1,4 +1,8 @@
-# pairwiseComparisons 0.1.4
+# pairwiseComparisons 0.2.5
+
+  - Maintenance release to import functions from `ipmisc`.
+
+# pairwiseComparisons 0.2.0
 
 BREAKING CHANGES
 

R/pairwise_comparisons.R

@@ -174,7 +174,7 @@ pairwise_comparisons <- function(data,
   data %<>%
     dplyr::select(.data = ., {{ x }}, {{ y }}) %>%
     dplyr::mutate(.data = ., {{ x }} := droplevels(as.factor({{ x }}))) %>%
-    tibble::as_tibble(x = .)
+    tibble::as_tibble(.)
 
   # ---------------------------- parametric ---------------------------------
 
@@ -203,7 +203,7 @@ pairwise_comparisons <- function(data,
       # extracting and cleaning up Tukey's HSD output
       df_tukey <-
         stats::TukeyHSD(x = aovmodel, conf.level = 0.95) %>%
-        broomExtra::tidy(x = .) %>%
+        ipmisc::tidy(.) %>%
         dplyr::select(.data = ., comparison, estimate) %>%
         tidyr::separate(
           data = .,
@@ -224,7 +224,7 @@ pairwise_comparisons <- function(data,
 
       # tidy dataframe with results from pairwise tests
       df_tidy <-
-        broomExtra::tidy(
+        ipmisc::tidy(
           stats::pairwise.t.test(
             x = data %>% dplyr::pull({{ y }}),
             g = data %>% dplyr::pull({{ x }}),
@@ -276,8 +276,8 @@ pairwise_comparisons <- function(data,
 
       # extracting the pairwise tests and formatting the output
       df <-
-        as.data.frame(x = jmv_pairs$comparisons[[1]]) %>%
-        tibble::as_tibble(x = .) %>%
+        as.data.frame(jmv_pairs$comparisons[[1]]) %>%
+        tibble::as_tibble(.) %>%
         dplyr::rename(
           .data = .,
           group1 = p1,
@@ -304,8 +304,8 @@ pairwise_comparisons <- function(data,
 
       # extracting the pairwise tests and formatting the output
       df <-
-        as.data.frame(x = jmv_pairs$comp) %>%
-        tibble::as_tibble(x = .) %>%
+        as.data.frame(jmv_pairs$comp) %>%
+        tibble::as_tibble(.) %>%
         dplyr::select(.data = ., -sep) %>%
         dplyr::rename(
           .data = .,
@@ -365,7 +365,8 @@ pairwise_comparisons <- function(data,
     df <-
       dplyr::full_join(
         # dataframe comparing comparison details
-        x = p_adjust_column_adder(df = rob_df_tidy, p.adjust.method = p.adjust.method) %>%
+        x = rob_df_tidy %>%
+          p_adjust_column_adder(df = ., p.adjust.method = p.adjust.method) %>%
           tidyr::gather(
             data = .,
             key = "key",
@@ -443,6 +444,21 @@ pairwise_comparisons <- function(data,
 }
 
 
+#' @noRd
+#'
+#' @importFrom rlang :=
+#'
+#' @keywords internal
+
+df_cleanup_paired <- function(data, x, y) {
+  data %<>%
+    long_to_wide_converter(data = ., x = {{ x }}, y = {{ y }}) %>%
+    tidyr::gather(data = ., key, value, -rowid) %>%
+    dplyr::arrange(.data = ., rowid) %>%
+    dplyr::rename(.data = ., {{ x }} := key, {{ y }} := value) %>%
+    dplyr::mutate(.data = ., {{ x }} := factor({{ x }}))
+}
+
 #' @name pairwise_comparisons
 #' @aliases  pairwise_comparisons
 #' @export

R/reexports.R

@@ -2,16 +2,20 @@
 # ----------------------- tidyverse -------------------------------------
 
 #' @export
-#' @importFrom broomExtra "%>%"
-broomExtra::`%>%`
+#' @importFrom ipmisc "%>%"
+ipmisc::`%>%`
 
 #' @export
-#' @importFrom broomExtra "%<>%"
-broomExtra::`%<>%`
+#' @importFrom ipmisc "%<>%"
+ipmisc::`%<>%`
 
 #' @export
-#' @importFrom broomExtra "%$%"
-broomExtra::`%$%`
+#' @importFrom ipmisc "%$%"
+ipmisc::`%$%`
+
+#' @export
+#' @importFrom ipmisc "%<-%"
+ipmisc::`%<-%`
 
 #' @export
 #' @importFrom rlang "%||%"
@@ -28,3 +32,18 @@ tibble::tibble
 #' @export
 #' @importFrom tibble as_tibble
 tibble::as_tibble
+
+
+# ----------------------- ipmisc -----------------------------------
+
+#' @export
+#' @importFrom ipmisc specify_decimal_p
+ipmisc::specify_decimal_p
+
+#' @export
+#' @importFrom ipmisc signif_column
+ipmisc::signif_column
+
+#' @export
+#' @importFrom ipmisc long_to_wide_converter
+ipmisc::long_to_wide_converter