Merge pull request #1 from egarpor/1.0-6

1.0-6
egarpor · May 19, 2019 · 9a99a46 · 9a99a46
2 parents 292ad2d + ad51ac7
commit 9a99a46
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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       = "",