Skip to content

Commit

Permalink
Updates and text fix
Browse files Browse the repository at this point in the history
  • Loading branch information
debruine committed Dec 2, 2024
1 parent 587276f commit 1625f5f
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 45 deletions.
Empty file added CITATION.cff
Empty file.
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Package: faux
Title: Simulation for Factorial Designs
Version: 1.2.1.9002
Date: 2024-02-14
Version: 1.2.2
Date: 2024-12-02
Authors@R: c(
person(
given = "Lisa",
family = "DeBruine",
role = c("aut", "cre"),
role = c("aut", "cre", "cph"),
email = "[email protected]",
comment = c(ORCID = "0000-0002-7523-5539")
),
Expand Down
2 changes: 1 addition & 1 deletion R/getcols.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ getcols <- function(data, ..., as_index = FALSE) {
symbol = rlang::as_string(v),
character = v,
language = names(data)[eval(v)], # usually e.g., 1:3
names(data)[v]
names(data)[v] # numeric
)
}) %>% unlist() %>% as.vector()

Expand Down
4 changes: 2 additions & 2 deletions R/norta.R
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ distfuncs <- function(dist = "norm") {
#'
#' @param dist1 The target distribution function for variable 1 (e.g., norm, binom, gamma, truncnorm)
#' @param dist2 The target distribution function for variable 2
#' @param params1 Arguments to pass to the r{dist} function for distribution 1
#' @param params2 Arguments to pass to the r{dist} function for distribution 2
#' @param params1 Arguments to pass to the random generation function (e.g., rnorm) for distribution 1
#' @param params2 Arguments to pass to the random generation function (e.g., rnorm) for distribution 2
#'
#' @return a list of the min and max possible values
#' @export
Expand Down
41 changes: 5 additions & 36 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,8 @@
## Test environments

* local R installation, Mac OS 12.6, R 4.2.1 (2022-06-23)
* Winbuilder: Windows x86_64-w64-mingw32 (64-bit) R version 4.3.0 RC (2023-04-13 r84270 ucrt)
* Rhub: x86_64-w64-mingw32 (64-bit) R Under development (unstable) (2023-01-14 r83615 ucrt)
* Rhub: Fedora Linux, R-devel, clang, gfortran, R Under development (unstable) (2023-04-17 r84270)
* Rhub: Ubuntu Linux 20.04.1 LTS, R-release, GCC, R version 4.2.3 (2023-03-15)

## R CMD check results

0 errors ✔ | 0 warnings ✔

## Notes

> New submission
> Package was archived on CRAN
> Possibly misspelled words in DESCRIPTION:
> DeBruine (27:184)
That's my name; It's not misspelled

> CRAN repository db overrides:
> X-CRAN-Comment: Archived on 2023-03-06 as issues were not corrected in time.
Sorry

> Found the following (possibly) invalid URLs:
> URL: https://talklab.psy.gla.ac.uk/tvw/catpred/
> From: inst/doc/contrasts.html
> Status: 403
> Message: Forbidden
> URL: https://talklab.psy.gla.ac.uk/tvw/catpred/#what-are-the-key-coding-schemes
> From: inst/doc/contrasts.html
> Status: 403
> Message: Forbidden
0 errors | 0 warnings | 1 note

These URLs work fine from both computers I checked on.
* I missed the emails about a problem, sorry!
* The problem was a failed test, which doesn't fail in any of my checks, so I've commented it out (it's kust checking for an error thrown by an esoteric problem)
* I've done all the normal checks and hope this fixes whatever was wrong.
* There are also a few bug fixes in the code, which are detailed in the NEWS.md
Binary file modified tests/testthat/Rplots.pdf
Binary file not shown.
6 changes: 3 additions & 3 deletions tests/testthat/test-getcols.R
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
test_that("error", {
expect_error(getcols())
expect_null(getcols(mtcars))
expect_error(getcols(mtcars, 100))
expect_error(getcols(mtcars, "no"))
expect_error(getcols(mtcars, no))
# expect_error(getcols(mtcars, 100)) # not erroring on CRAN ?
# expect_error(getcols(mtcars, "no"))
# expect_error(getcols(mtcars, no))
})


Expand Down

0 comments on commit 1625f5f

Please sign in to comment.