diff --git a/CRAN-RELEASE b/CRAN-RELEASE deleted file mode 100644 index cf8180a..0000000 --- a/CRAN-RELEASE +++ /dev/null @@ -1,2 +0,0 @@ -This package was submitted to CRAN on 2019-05-13. -Once it is accepted, delete this file and tag the release (commit b8bb448c39). diff --git a/DESCRIPTION b/DESCRIPTION index 012e2ca..3be48ac 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: rotasym Type: Package Title: Tests for Rotational Symmetry on the Hypersphere -Version: 1.0-5 -Date: 2019-05-13 +Version: 1.0-6 +Date: 2019-05-19 Authors@R: c( person(given = "Eduardo", family = "García-Portugués", role = c("aut", "cre"), email = "edgarcia@est-econ.uc3m.es"), @@ -19,8 +19,7 @@ License: GPL-3 LazyData: true Depends: R (>= 3.4.0), - Rcpp, - RcppZiggurat + Rcpp Suggests: rgl, viridisLite diff --git a/NAMESPACE b/NAMESPACE index 91a276c..7de4f2d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -25,6 +25,5 @@ export(spherical_mean) export(test_rotasym) export(w_p) import(Rcpp) -import(RcppZiggurat) import(stats) useDynLib(rotasym) diff --git a/NEWS.md b/NEWS.md index adbe5b0..450092f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,3 +5,7 @@ # rotasym 1.0-5 * Change description field in DESCRIPTION, minor aesthetic changes to examples + +# rotasym 1.0-6 + +* Changes to improve the behaviour of `r_ACG` and `r_unif_sphere` with `base::set.seed`: drop `RcppZiggurat`. diff --git a/R/ACG.R b/R/ACG.R index afd4159..53ab777 100644 --- a/R/ACG.R +++ b/R/ACG.R @@ -128,7 +128,7 @@ r_ACG <- function(n, Lambda) { p <- sqrt(length(Lambda)) # Simulation (chol() generates an error if Lambda is not positive definite) - x <- matrix(RcppZiggurat::zrnorm(n = n * p), nrow = n, ncol = p) %*% + x <- matrix(rnorm(n = n * p), nrow = n, ncol = p, byrow = TRUE) %*% chol(Lambda) # Projection diff --git a/R/rotasym-package.R b/R/rotasym-package.R index 63d9039..87f9573 100644 --- a/R/rotasym-package.R +++ b/R/rotasym-package.R @@ -16,7 +16,7 @@ #' \emph{arXiv:1706.05030}. \url{https://arxiv.org/abs/1706.05030} #' @docType package #' @name rotasym-package -#' @import stats Rcpp RcppZiggurat +#' @import stats Rcpp #' @useDynLib rotasym #' @aliases rotasym rotasym-package NULL diff --git a/R/unif.R b/R/unif.R index 22873f4..8b79e49 100644 --- a/R/unif.R +++ b/R/unif.R @@ -102,7 +102,7 @@ r_unif_sphere <- function(n, p) { } else { # Project a N_p(0, I_p) to the sphere - x <- matrix(RcppZiggurat::zrnorm(n = n * p), nrow = n, ncol = p) + x <- matrix(rnorm(n = n * p), nrow = n, ncol = p, byrow = TRUE) return(x / sqrt(rowSums(x * x))) } diff --git a/inst/CITATION b/inst/CITATION index b339be2..684ba6e 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -5,7 +5,7 @@ citEntry(entry = "Article", author = personList(as.person("Eduardo García-Portugués"), as.person("Davy Paindaveine"), as.person("Thomas Verdebout")), - journal = "arXiv", + journal = "arXiv:1706.05030", year = "2019", volume = "", number = "",