Skip to content

Commit db96f37

Browse files
authored
Merge pull request #23 from gowerc/hotfix_rng
Hotfix rng
2 parents 29db338 + cfdd1d1 commit db96f37

File tree

8 files changed

+18
-9
lines changed

8 files changed

+18
-9
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: diffdf
22
Type: Package
33
Title: Dataframe Difference Tool
4-
Version: 1.0.2
4+
Version: 1.0.3
55
Authors@R: c(
66
person("Craig" ,"Gower" , email = "craig.gower@roche.com" , role = c("cre","aut")),
77
person("Kieran", "Martin" , email = "kieran.martin@roche.com" , role = "aut")

NEWS.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# diffdf 1.0.3
2+
3+
- No new functionality
4+
- Update to make package compatible with the changes made to sampling within core R
5+
16
# diffdf 1.0.2
27

38
- No new functionality
@@ -10,7 +15,6 @@
1015
- Added Travis
1116
- Added CodeCov
1217

13-
1418
# diffdf 1.0.0
1519

1620
- Initial Release !!

cran-comments.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
## Release summary
22
In this version I have:
3-
- Updated the package to be compatible with tibble 2.0.0 to fix the related automated test errors
3+
- Updated the package to use suppressWarnings(RNGversion("3.5.0")) wherever set.seed() has been used to make sure test results and vignette results are consistent after the planned changes to the random number generator
44

55
## Test environments
6-
- local Windows 10 R 3.5.1
7-
- local Ubuntu 18.04.1 LTS R 3.5.2
8-
- Win-Builder R-devel
6+
- local Mac OS Mojave R 3.5.2
7+
- Win-Builder R-release
98
- Debian Linux R-release (via rhub)
109

1110
## R CMD check results

man/cast_variables.Rd

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

tests/testthat/helper-create_test_data.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ library(diffdf)
44
library(purrr)
55
library(tibble)
66

7+
suppressWarnings(RNGversion("3.5.0"))
78
set.seed(20202)
89

910
LENGTH <- 20

tests/testthat/test-core.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ context("Testing entire function")
77
#
88
# Set up testing datasets
99
#
10-
10+
suppressWarnings(RNGversion("3.5.0"))
1111
set.seed(101010223)
1212

1313

utils/benchmarks/benchmark.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
library(dplyr)
22
library(diffdf)
33

4+
suppressWarnings(RNGversion("3.5.0"))
5+
46
benchmark <- function(nrow, ncol, seedin, same = T){
57
set.seed(seedin)
68
data1 <- rnorm(nrow*ncol)

vignettes/diffdf-basic.Rmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ Here we show the basic functionality of `diffdf` using a dummy data set.
2929
library(diffdf)
3030
3131
LENGTH = 30
32+
33+
suppressWarnings(RNGversion("3.5.0"))
3234
set.seed(12334)
35+
3336
test_data <- tibble::tibble(
3437
ID = 1:LENGTH,
3538
GROUP1 = rep( c(1,2) , each = LENGTH/2),

0 commit comments

Comments
 (0)