Skip to content

Commit 190b415

Browse files
IndrajeetPatilIndrajeetPatil
authored
Merge pull request #219 from IndrajeetPatil/fixing_tests
fixing broken tests; closes #213; closes #212
2 parents 5c275b9 + 12d2efa commit 190b415

File tree

223 files changed

+2081
-2070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+2081
-2070
lines changed

‎DESCRIPTION

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,27 @@ Depends:
3232
R (>= 3.5.0)
3333
Imports:
3434
BayesFactor (>= 0.9.12-4.2),
35-
boot (>= 1.3-20),
36-
broomExtra (>= 0.0.1),
35+
boot (>= 1.3-21),
36+
broomExtra (>= 0.0.3),
3737
cowplot (>= 0.9.4),
3838
crayon (>= 1.3.4),
3939
DescTools (>= 0.99.28),
40-
dplyr (>= 0.8.0.1),
40+
dplyr (>= 0.8.1),
4141
ellipsis (>= 0.1.0),
4242
ez (>= 4.4-0),
4343
forcats (>= 0.4.0),
44-
ggcorrplot (>= 0.1.2),
44+
ggcorrplot (>= 0.1.3),
4545
ggExtra (>= 0.8),
4646
ggplot2 (>= 3.1.1),
47-
ggrepel (>= 0.8.0),
47+
ggrepel (>= 0.8.1),
4848
ggsignif (>= 0.5.0),
49-
glue (>= 1.3.0),
49+
glue (>= 1.3.1),
5050
grid,
5151
groupedstats (>= 0.0.6),
52-
jmv (>= 0.9.6),
52+
jmv (>= 0.9.6.1),
5353
magrittr (>= 1.5),
54-
metaBMA,
55-
metafor (>= 2.0-0),
54+
metaBMA (>= 0.3.9),
55+
metafor (>= 2.1-0),
5656
methods,
5757
paletteer (>= 0.2.1),
5858
psych (>= 1.8.12),

‎R/ggscatterstats.R

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,7 @@ ggscatterstats <- function(data,
211211
# creating a new dataframe for showing labels
212212
label_expr_enxpr <- rlang::enexpr(label.expression)
213213
label_data <-
214-
data %>%
215-
{
214+
data %>% {
216215
if ("label.expression" %in% names(param_list)) {
217216
# testing for whether we received bare or quoted
218217
if (typeof(label_expr_enxpr) == "language") {

‎R/helpers_ggbetween_t_subtitles.R

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,28 +1020,19 @@ effsize_t_parametric <- function(formula = NULL,
10201020
# -------------- return results desired ------------------
10211021

10221022
if (isTRUE(noncentral)) {
1023-
return(tibble::tibble(
1024-
method = method,
1025-
estimate = d,
1026-
conf.low = min(ncp.lower.ci, ncp.upper.ci),
1027-
conf.high = max(ncp.lower.ci, ncp.upper.ci),
1028-
conf.level = conf.level,
1029-
alternative = "two.sided",
1030-
paired = paired,
1031-
noncentral = noncentral,
1032-
var.equal = var.equal
1033-
))
1034-
} else {
1035-
return(tibble::tibble(
1036-
method = method,
1037-
estimate = d,
1038-
conf.low = lower.ci,
1039-
conf.high = upper.ci,
1040-
conf.level = conf.level,
1041-
alternative = "two.sided",
1042-
paired = paired,
1043-
noncentral = noncentral,
1044-
var.equal = var.equal
1045-
))
1023+
lower.ci <- min(ncp.lower.ci, ncp.upper.ci)
1024+
upper.ci <- max(ncp.lower.ci, ncp.upper.ci)
10461025
}
1026+
1027+
return(tibble::tibble(
1028+
method = method,
1029+
estimate = d,
1030+
conf.low = lower.ci,
1031+
conf.high = upper.ci,
1032+
conf.level = conf.level,
1033+
alternative = "two.sided",
1034+
paired = paired,
1035+
noncentral = noncentral,
1036+
var.equal = var.equal
1037+
))
10471038
}

‎R/helpers_ggcoefstats.R

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,6 @@ subtitle_meta_ggcoefstats <- function(data,
764764
#'
765765
#' # getting bayes factor in favor of null hypothesis
766766
#' ggstatsplot::bf_meta_message(data = df, k = 3, sample = 50)
767-
#'
768767
#' @export
769768

770769
# function body

‎README.Rmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Package | Status | Usage | GitHub | References
2323
[![minimal R version](https://img.shields.io/badge/R%3E%3D-3.5.0-6666ff.svg)](https://cran.r-project.org/) | [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/) | [![Monthly downloads badge](https://cranlogs.r-pkg.org/badges/last-month/ggstatsplot?color=blue)](https://CRAN.R-project.org/package=ggstatsplot) | [![Github Issues](http://githubbadges.herokuapp.com/IndrajeetPatil/ggstatsplot/issues.svg)](https://github.com/IndrajeetPatil/ggstatsplot/issues) | [![vignettes](https://img.shields.io/badge/vignettes-0.0.10-orange.svg?colorB=FF5722)](https://cran.r-project.org/web/packages/ggstatsplot/vignettes/)
2424
[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/IndrajeetPatil/ggstatsplot.svg)](https://github.com/IndrajeetPatil/ggstatsplot) | [![Coverage Status](https://coveralls.io/repos/github/IndrajeetPatil/ggstatsplot/badge.svg?branch=master)](https://coveralls.io/github/IndrajeetPatil/ggstatsplot?branch=master) | [![Total downloads badge](https://cranlogs.r-pkg.org/badges/grand-total/ggstatsplot?color=blue)](https://CRAN.R-project.org/package=ggstatsplot) | [![Github Stars](https://img.shields.io/github/stars/IndrajeetPatil/ggstatsplot.svg?style=social&label=Github)](https://github.com/IndrajeetPatil/ggstatsplot) | [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2074621.svg)](https://doi.org/10.5281/zenodo.2074621)
2525
[![Licence](https://img.shields.io/badge/licence-GPL--3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) | [![Codecov test coverage](https://codecov.io/gh/IndrajeetPatil/ggstatsplot/branch/master/graph/badge.svg)](https://codecov.io/gh/IndrajeetPatil/ggstatsplot?branch=master) | [![HitCount](http://hits.dwyl.io/IndrajeetPatil/ggstatsplot.svg)](http://hits.dwyl.io/IndrajeetPatil/ggstatsplot) | [![Last-changedate](https://img.shields.io/badge/last%20change-`r gsub('-', '--', Sys.Date())`-yellowgreen.svg)](/commits/master) | [![GitHub last commit](https://img.shields.io/github/last-commit/IndrajeetPatil/ggstatsplot.svg)](https://github.com/IndrajeetPatil/ggstatsplot/commits/master)
26-
[![status](https://tinyverse.netlify.com/badge/ggstatsplot)](https://CRAN.R-project.org/package=ggstatsplot) | [![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2019_01_31-yellowgreen.svg)](https://github.com/IndrajeetPatil/ggstatsplot/blob/master/tests/README.md) | [![saythanks](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/IndrajeetPatil) | [![Project Status](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) | [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/IndrajeetPatil/ggstatsplot/issues)
26+
[![status](https://tinyverse.netlify.com/badge/ggstatsplot)](https://CRAN.R-project.org/package=ggstatsplot) | [![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2019_05_25-yellowgreen.svg)](https://github.com/IndrajeetPatil/ggstatsplot/blob/master/tests/README.md) | [![saythanks](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/IndrajeetPatil) | [![Project Status](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) | [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/IndrajeetPatil/ggstatsplot/issues)
2727
[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/ggstatsplot/community) | [![Dependency Status](https://dependencyci.com/github/IndrajeetPatil/ggstatsplot/badge)](https://dependencyci.com/github/IndrajeetPatil/ggstatsplot) | | [![Generic badge](https://img.shields.io/badge/forks-49-blue.svg)](https://github.com/IndrajeetPatil/ggstatsplot/) |
2828

2929
# Overview
@@ -465,7 +465,7 @@ Non-parametric | > 2 | Friedman test
465465
Robust | > 2 | Heteroscedastic one-way repeated measures ANOVA for trimmed means
466466
Bayes Factor | > 2 | One-way repeated measures ANOVA
467467
Parametric | 2 | Student's *t*-test
468-
Non-parametric | 2 | Mann–Whitney *U* test
468+
Non-parametric | 2 | Wilcoxon signed-rank test
469469
Robust | 2 | Yuen's test on trimmed means for dependent samples
470470
Bayes Factor | 2 | Student's *t*-test
471471

@@ -479,7 +479,7 @@ Non-parametric | Durbin-Conover test | <font color="green">Yes</font>
479479
Robust | Yuen's trimmed means test | <font color="green">Yes</font>
480480
Bayes Factor | <font color="red">No</font> | <font color="red">No</font>
481481

482-
For more, see the `ggbetweenstats` vignette:
482+
For more, see the `ggwithinstats` vignette:
483483
<https://indrajeetpatil.github.io/ggstatsplot/articles/web_only/ggwithinstats.html>
484484

485485
## `ggscatterstats`

‎README.md

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
| [![CRAN Checks](https://cranchecks.info/badges/summary/ggstatsplot)](https://cran.r-project.org/web/checks/check_results_ggstatsplot.html) | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/IndrajeetPatil/ggstatsplot?branch=master&svg=true)](https://ci.appveyor.com/project/IndrajeetPatil/ggstatsplot) | [![Weekly downloads badge](https://cranlogs.r-pkg.org/badges/last-week/ggstatsplot?color=blue)](https://CRAN.R-project.org/package=ggstatsplot) | [![Github Pending PRs](http://githubbadges.herokuapp.com/IndrajeetPatil/ggstatsplot/pulls.svg?style=flat)](https://github.com/IndrajeetPatil/ggstatsplot/pulls) | [![Rdoc](https://www.rdocumentation.org/badges/version/ggstatsplot)](https://www.rdocumentation.org/packages/ggstatsplot) |
1010
| [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.5.0-6666ff.svg)](https://cran.r-project.org/) | [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/) | [![Monthly downloads badge](https://cranlogs.r-pkg.org/badges/last-month/ggstatsplot?color=blue)](https://CRAN.R-project.org/package=ggstatsplot) | [![Github Issues](http://githubbadges.herokuapp.com/IndrajeetPatil/ggstatsplot/issues.svg)](https://github.com/IndrajeetPatil/ggstatsplot/issues) | [![vignettes](https://img.shields.io/badge/vignettes-0.0.10-orange.svg?colorB=FF5722)](https://cran.r-project.org/web/packages/ggstatsplot/vignettes/) |
1111
| [![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/IndrajeetPatil/ggstatsplot.svg)](https://github.com/IndrajeetPatil/ggstatsplot) | [![Coverage Status](https://coveralls.io/repos/github/IndrajeetPatil/ggstatsplot/badge.svg?branch=master)](https://coveralls.io/github/IndrajeetPatil/ggstatsplot?branch=master) | [![Total downloads badge](https://cranlogs.r-pkg.org/badges/grand-total/ggstatsplot?color=blue)](https://CRAN.R-project.org/package=ggstatsplot) | [![Github Stars](https://img.shields.io/github/stars/IndrajeetPatil/ggstatsplot.svg?style=social&label=Github)](https://github.com/IndrajeetPatil/ggstatsplot) | [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2074621.svg)](https://doi.org/10.5281/zenodo.2074621) |
12-
| [![Licence](https://img.shields.io/badge/licence-GPL--3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) | [![Codecov test coverage](https://codecov.io/gh/IndrajeetPatil/ggstatsplot/branch/master/graph/badge.svg)](https://codecov.io/gh/IndrajeetPatil/ggstatsplot?branch=master) | [![HitCount](http://hits.dwyl.io/IndrajeetPatil/ggstatsplot.svg)](http://hits.dwyl.io/IndrajeetPatil/ggstatsplot) | [![Last-changedate](https://img.shields.io/badge/last%20change-2019--04--15-yellowgreen.svg)](/commits/master) | [![GitHub last commit](https://img.shields.io/github/last-commit/IndrajeetPatil/ggstatsplot.svg)](https://github.com/IndrajeetPatil/ggstatsplot/commits/master) |
13-
| [![status](https://tinyverse.netlify.com/badge/ggstatsplot)](https://CRAN.R-project.org/package=ggstatsplot) | [![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2019_01_31-yellowgreen.svg)](https://github.com/IndrajeetPatil/ggstatsplot/blob/master/tests/README.md) | [![saythanks](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/IndrajeetPatil) | [![Project Status](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) | [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/IndrajeetPatil/ggstatsplot/issues) |
12+
| [![Licence](https://img.shields.io/badge/licence-GPL--3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) | [![Codecov test coverage](https://codecov.io/gh/IndrajeetPatil/ggstatsplot/branch/master/graph/badge.svg)](https://codecov.io/gh/IndrajeetPatil/ggstatsplot?branch=master) | [![HitCount](http://hits.dwyl.io/IndrajeetPatil/ggstatsplot.svg)](http://hits.dwyl.io/IndrajeetPatil/ggstatsplot) | [![Last-changedate](https://img.shields.io/badge/last%20change-2019--05--25-yellowgreen.svg)](/commits/master) | [![GitHub last commit](https://img.shields.io/github/last-commit/IndrajeetPatil/ggstatsplot.svg)](https://github.com/IndrajeetPatil/ggstatsplot/commits/master) |
13+
| [![status](https://tinyverse.netlify.com/badge/ggstatsplot)](https://CRAN.R-project.org/package=ggstatsplot) | [![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2019_05_25-yellowgreen.svg)](https://github.com/IndrajeetPatil/ggstatsplot/blob/master/tests/README.md) | [![saythanks](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/IndrajeetPatil) | [![Project Status](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active) | [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/IndrajeetPatil/ggstatsplot/issues) |
1414
| [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/ggstatsplot/community) | [![Dependency Status](https://dependencyci.com/github/IndrajeetPatil/ggstatsplot/badge)](https://dependencyci.com/github/IndrajeetPatil/ggstatsplot) | | [![Generic badge](https://img.shields.io/badge/forks-49-blue.svg)](https://github.com/IndrajeetPatil/ggstatsplot/) | |
1515

1616
# Overview
@@ -63,8 +63,7 @@ Yuen’s test for trimmed means (robust *t*-test):
6363
# Summary of supported statistical analyses
6464

6565
The table below summarizes all the different types of analyses currently
66-
supported in this
67-
package-
66+
supported in this package-
6867

6968
| Functions | Description | Parametric | Non-parametric | Robust | Bayes Factor |
7069
| -------------------------------- | ----------------------------------------- | ------------------------------ | ------------------------------ | ------------------------------ | ------------------------------ |
@@ -184,18 +183,6 @@ For example-
184183

185184
``` r
186185
args(name = ggstatsplot::specify_decimal_p)
187-
#> Registered S3 method overwritten by 'broom.mixed':
188-
#> method from
189-
#> tidy.gamlss broom
190-
#> Registered S3 methods overwritten by 'lme4':
191-
#> method from
192-
#> cooks.distance.influence.merMod car
193-
#> influence.merMod car
194-
#> dfbeta.influence.merMod car
195-
#> dfbetas.influence.merMod car
196-
#> Registered S3 method overwritten by 'skimr':
197-
#> method from
198-
#> print.spark pillar
199186
#> function (x, k = 3, p.value = FALSE)
200187
#> NULL
201188
```
@@ -214,7 +201,6 @@ ggstatsplot::ggplot_converter
214201
#> # returning the converted plot
215202
#> return(p)
216203
#> }
217-
#> <bytecode: 0x000000002e003450>
218204
#> <environment: namespace:ggstatsplot>
219205
```
220206

@@ -506,7 +492,7 @@ analyses-
506492
| Robust | \> 2 | Heteroscedastic one-way repeated measures ANOVA for trimmed means |
507493
| Bayes Factor | \> 2 | One-way repeated measures ANOVA |
508494
| Parametric | 2 | Student’s *t*-test |
509-
| Non-parametric | 2 | Mann–Whitney *U* test |
495+
| Non-parametric | 2 | Wilcoxon signed-rank test |
510496
| Robust | 2 | Yuen’s test on trimmed means for dependent samples |
511497
| Bayes Factor | 2 | Student’s *t*-test |
512498

@@ -520,7 +506,7 @@ Here is a summary of *multiple pairwise comparison* tests supported in
520506
| Robust | Yuen’s trimmed means test | <font color="green">Yes</font> |
521507
| Bayes Factor | <font color="red">No</font> | <font color="red">No</font> |
522508

523-
For more, see the `ggbetweenstats` vignette:
509+
For more, see the `ggwithinstats` vignette:
524510
<https://indrajeetpatil.github.io/ggstatsplot/articles/web_only/ggwithinstats.html>
525511

526512
## `ggscatterstats`
@@ -624,8 +610,7 @@ ggstatsplot::grouped_ggscatterstats(
624610

625611
Following tests are carried out for each type of analyses. Additionally,
626612
the correlation coefficients (and their confidence intervals) are used
627-
as effect
628-
sizes-
613+
as effect sizes-
629614

630615
| Type | Test | CI? |
631616
| -------------- | --------------------------------------- | ----------------------------- |
@@ -1170,8 +1155,7 @@ ggstatsplot::grouped_ggcorrmat(
11701155

11711156
Following tests are carried out for each type of analyses. Additionally,
11721157
the correlation coefficients (and their confidence intervals) are used
1173-
as effect
1174-
sizes-
1158+
as effect sizes-
11751159

11761160
| Type | Test | CI? |
11771161
| -------------- | --------------------------------------- | ----------------------------- |
@@ -1286,8 +1270,7 @@ choose, `ggstatsplot` in the backdrop adds a new layer with its
12861270
idiosyncratic theme settings, chosen to make the graphs more readable or
12871271
aesthetically pleasing. Let’s see an example with `gghistostats` and see
12881272
how a certain theme from `hrbrthemes` package looks with and without the
1289-
`ggstatsplot`
1290-
layer.
1273+
`ggstatsplot` layer.
12911274

12921275
``` r
12931276
# to use hrbrthemes themes, first make sure you have all the necessary fonts

‎Rplots.pdf

927 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)