bump to devel

IndrajeetPatil · Sep 4, 2020 · 8049c44 · 8049c44 · lintr-bot · Sep 4, 2020
1 parent 2d7769a
commit 8049c44
Show file tree

Hide file tree

Showing 25 changed files with 232 additions and 233 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: pairwiseComparisons
 Title: Multiple Pairwise Comparison Tests
-Version: 2.0.0
+Version: 2.0.0.9000
 Authors@R: 
     person(given = "Indrajeet",
            family = "Patil",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,5 @@
+# pairwiseComparisons 2.0.0.9000
+
 # pairwiseComparisons 2.0.0
 
   - Fixes a bug which affected results for within-subjects design when the

diff --git a/R/pairwise_comparisons.R b/R/pairwise_comparisons.R
@@ -69,6 +69,9 @@
 #' set.seed(123)
 #' library(pairwiseComparisons)
 #'
+#' # show me all columns and make the column titles bold
+#' options(tibble.width = Inf, pillar.bold = TRUE)
+#'
 #' #------------------- between-subjects design ----------------------------
 #'
 #' # parametric
@@ -217,42 +220,25 @@ pairwise_comparisons <- function(data,
           .data = .,
           {{ x }} := forcats::fct_relabel(
             .f = {{ x }},
-            .fun = ~ gsub(
-              x = .x,
-              pattern = "-",
-              replacement = "_"
-            )
+            .fun = ~ gsub(x = .x, pattern = "-", replacement = "_")
           )
         )
 
       # extracting and cleaning up Tukey's HSD output
       df_tukey <-
         stats::TukeyHSD(x = aovmodel, conf.level = 0.95) %>%
-        broomExtra::tidy(.)
-
-      # breaking change in `broom 0.7.0`
-      if ("contrast" %in% names(df_tukey)) {
-        df_tukey %<>% dplyr::rename(.data = ., comparison = contrast)
-      }
-
-      # cleanup
-      df_tukey %<>%
-        dplyr::select(.data = ., comparison, estimate) %>%
+        broomExtra::tidy(.) %>%
+        dplyr::select(.data = ., comparison = contrast, mean.difference = estimate) %>%
         tidyr::separate(
           data = .,
           col = comparison,
           into = c("group1", "group2"),
           sep = "-"
         ) %>%
-        dplyr::rename(.data = ., mean.difference = estimate) %>%
         dplyr::mutate_at(
           .tbl = .,
           .vars = dplyr::vars(dplyr::matches("^group[0-9]$")),
-          .funs = ~ gsub(
-            x = .,
-            pattern = "_",
-            replacement = "-"
-          )
+          .funs = ~ gsub(x = ., pattern = "_", replacement = "-")
         )
 
       # tidy dataframe with results from pairwise tests

diff --git a/codemeta.json b/codemeta.json
@@ -14,7 +14,7 @@
   ],
   "issueTracker": "\n    https://github.com/IndrajeetPatil/pairwiseComparisons/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "2.0.0",
+  "version": "2.0.0.9000",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
@@ -278,5 +278,5 @@
     "name": "Comprehensive R Archive Network (CRAN)",
     "url": "https://cran.r-project.org"
   },
-  "fileSize": "1320.873KB"
+  "fileSize": "1321.401KB"
 }
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/SUPPORT.html b/docs/SUPPORT.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: 2.10.1
 pkgdown: 1.5.1.9000
 pkgdown_sha: c6b35532515a7ae433eff4b547d77eeae4278664
 articles: []
-last_built: 2020-09-04T11:36Z
+last_built: 2020-09-04T19:50Z
 urls:
   reference: https://indrajeetpatil.github.io/pairwiseComparisons//reference
   article: https://indrajeetpatil.github.io/pairwiseComparisons//articles

diff --git a/docs/reference/bugs_long.html b/docs/reference/bugs_long.html
diff --git a/docs/reference/games_howell.html b/docs/reference/games_howell.html
diff --git a/docs/reference/index.html b/docs/reference/index.html