Skip to content

Commit 80eefc9

Browse files
authored
Merge pull request #411 from easystats/CRAN-patch
CRAN patch 0.6.0.1
2 parents 3e5da37 + f6ec3c4 commit 80eefc9

File tree

9 files changed

+57
-22
lines changed

9 files changed

+57
-22
lines changed

DESCRIPTION

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Imports:
6060
insight (>= 0.15.0),
6161
parameters (>= 0.16.0),
6262
performance (>= 0.8.0),
63-
datawizard (>= 0.2.2.9000),
63+
datawizard (>= 0.2.2),
6464
stats,
6565
utils
6666
Suggests:
@@ -90,8 +90,6 @@ Suggests:
9090
spelling,
9191
testthat,
9292
tidymodels
93-
Remotes:
94-
easystats/datawizard
9593
VignetteBuilder:
9694
knitr
9795
Encoding: UTF-8

NAMESPACE

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ export(F_to_f)
6262
export(F_to_f2)
6363
export(F_to_omega2)
6464
export(F_to_r)
65+
export(adjust)
66+
export(change_scale)
6567
export(chisq_to_cohens_w)
6668
export(chisq_to_cramers_v)
6769
export(chisq_to_pearsons_c)
@@ -151,6 +153,7 @@ export(kendalls_w)
151153
export(logoddsratio_to_d)
152154
export(logoddsratio_to_r)
153155
export(mad_pooled)
156+
export(normalize)
154157
export(odds_to_probs)
155158
export(oddsratio)
156159
export(oddsratio_to_d)
@@ -167,6 +170,7 @@ export(r_to_d)
167170
export(r_to_oddsratio)
168171
export(rank_biserial)
169172
export(rank_epsilon_squared)
173+
export(ranktransform)
170174
export(rb_to_cles)
171175
export(rb_to_common_language)
172176
export(riskratio)
@@ -185,12 +189,18 @@ export(t_to_f)
185189
export(t_to_f2)
186190
export(t_to_omega2)
187191
export(t_to_r)
192+
export(unstandardize)
188193
export(z_to_d)
189194
export(z_to_r)
190195
importFrom(bayestestR,describe_posterior)
191196
importFrom(bayestestR,equivalence_test)
197+
importFrom(datawizard,adjust)
198+
importFrom(datawizard,change_scale)
192199
importFrom(datawizard,demean)
200+
importFrom(datawizard,normalize)
201+
importFrom(datawizard,ranktransform)
193202
importFrom(datawizard,standardize)
203+
importFrom(datawizard,unstandardize)
194204
importFrom(insight,check_if_installed)
195205
importFrom(insight,clean_names)
196206
importFrom(insight,find_formula)

NEWS.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
# effectsize 0.6.1
1+
# effectsize 0.6.0.1
22

3-
## Breaking Changes
4-
5-
- `adjust()`, `normalize()`, `ranktransform()`, `unstandardize()`, and `change_scale()` are no longer re-exported from `datawizard`.
3+
*This is a patch release.*
64

75
## Bug fixes
86

R/effectsize.htest.R

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ effectsize.htest <- function(model, type = NULL, verbose = TRUE, ...) {
1616
dots$mu <- model$null.value
1717

1818
if (approx) {
19-
if (verbose) {
20-
warning("Unable to retrieve data from htest object. Using t_to_d() approximation.")
21-
}
22-
2319
if (type == "cles") {
2420
stop("Unable to retrieve data from htest object. Cannot compute CLES.")
21+
} else if (verbose) {
22+
warning("Unable to retrieve data from htest object. Using t_to_d() approximation.")
2523
}
2624

2725
f <- t_to_d
@@ -172,14 +170,16 @@ effectsize.htest <- function(model, type = NULL, verbose = TRUE, ...) {
172170

173171
if (approx) {
174172
stop("Unable to retrieve data from htest object.",
175-
"\nTry using",ifelse(type=="cles", "'rank_biserial()'", "'cles()'")," directly.",
173+
"\nTry using",ifelse(type=="cles", "'cles()'", "'rank_biserial()'")," directly.",
176174
call. = FALSE
177175
)
178176
}
179177

180178
f <- switch(tolower(type),
181179
r = ,
182180
rb = ,
181+
rbs = ,
182+
r_rank_biserial = ,
183183
rank_biserial = rank_biserial,
184184
cles = cles
185185
)

R/equivalence_test.R

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#' @importFrom bayestestR equivalence_test
2-
#' @export
3-
bayestestR::equivalence_test
4-
51
#' @title Test for Practical Equivalence
62
#'
73
#' @description Perform a **Test for Practical Equivalence** for indices of

R/reexports.R

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
1+
#' @importFrom bayestestR equivalence_test
2+
#' @export
3+
bayestestR::equivalence_test
4+
15
#' @export
26
#' @importFrom datawizard standardize
37
datawizard::standardize
48

9+
10+
11+
12+
13+
## TODO: removed the following from see / modelbased --------------------
14+
15+
#' @export
16+
#' @importFrom datawizard ranktransform
17+
datawizard::ranktransform
18+
19+
#' @export
20+
#' @importFrom datawizard adjust
21+
datawizard::adjust
22+
23+
#' @export
24+
#' @importFrom datawizard change_scale
25+
datawizard::change_scale
26+
27+
#' @export
28+
#' @importFrom datawizard normalize
29+
datawizard::normalize
30+
31+
#' @export
32+
#' @importFrom datawizard unstandardize
33+
datawizard::unstandardize

cran-comments.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ All URL issues have been resolved.
2424

2525
We checked 16 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
2626

27-
* We saw 1 new problems
28-
* `report`: Error is expected. Authors have been updated and will submit updated package.
27+
* We saw 0 new problems
2928
* We failed to check 0 packages

man/reexports.Rd

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-interpret.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ if (require("testthat") && require("effectsize")) {
209209
dem60 ~ ind60 "
210210
model <- lavaan::sem(structure, data = lavaan::PoliticalDemocracy)
211211
int <- interpret(model)
212-
expect_equal(int$Name, c("GFI", "AGFI", "NFI", "NNFI", "CFI", "RMSEA", "SRMR", "RFI", "IFI", "PNFI"))
213-
expect_equal(int$Value,c(0.9666, 0.9124, 0.9749, 1.0001, 1, 0, 0.0273, 0.9529, 1.0001, 0.5199), tolerance = 0.001)
212+
expect_equal(int$Name, c("GFI", "AGFI", "NFI", "NNFI", "CFI", "RMSEA", "SRMR", "RFI", "PNFI", "IFI"))
213+
expect_equal(int$Value,c(0.9666, 0.9124, 0.9749, 1.0001, 1, 0, 0.0273, 0.9529, 0.5199, 1.0001), tolerance = 0.001)
214214
})
215215

216216
test_that("interpret_icc", {

0 commit comments

Comments
 (0)