Skip to content

Commit 715c4f6

Browse files
StuartWheaterStuartWheater
authored
Merge pull request #416 from StuartWheater/v6.3.4-dev
Rework access to 'old_seed'
2 parents bc6b2d3 + c81e5ed commit 715c4f6

File tree

9 files changed

+17
-18
lines changed

9 files changed

+17
-18
lines changed

‎R/blackBoxDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ blackBoxDS <- function(input.var.name=NULL,
6868

6969
# back-up current .Random.seed and revert on.exit
7070
if (exists(x = ".Random.seed", envir = globalenv())) {
71-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
72-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
71+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
72+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
7373
} else
7474
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
7575

‎R/blackBoxRanksDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ blackBoxRanksDS <- function(input.var.name=NULL, shared.seedval){ #START FUNC
6363

6464
# back-up current .Random.seed and revert on.exit
6565
if (exists(x = ".Random.seed", envir = globalenv())) {
66-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
67-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
66+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
67+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
6868
} else
6969
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
7070

‎R/global.R‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22

33
utils::globalVariables(c('offset.to.use', 'weights.to.use', 'out.table.real', 'out.table.dim', 'out.table.dimnames', 'list.obj', 'mg',
44
'blackbox.output.df', 'blackbox.ranks.df', 'global.bounds.df', 'global.ranks.quantiles.df', 'sR4.df',
5-
'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','.Random.seed'))
6-
5+
'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','.old_seed','.Random.seed'))

‎R/heatmapPlotDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ heatmapPlotDS <- function(x, y, k, noise, method.indicator){
4040

4141
# back-up current .Random.seed and revert on.exit
4242
if (exists(x = ".Random.seed", envir = globalenv())) {
43-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
44-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
43+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
44+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
4545
} else
4646
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
4747

‎R/histogramDS1.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ histogramDS1 <- function(xvect, method.indicator, k, noise){
3838

3939
# back-up current .Random.seed and revert on.exit
4040
if (exists(x = ".Random.seed", envir = globalenv())) {
41-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
42-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
41+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
42+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
4343
} else
4444
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
4545

‎R/histogramDS2.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ histogramDS2 <- function (xvect, num.breaks, min, max, method.indicator, k, nois
4040

4141
# back-up current .Random.seed and revert on.exit
4242
if (exists(x = ".Random.seed", envir = globalenv())) {
43-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
44-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
43+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
44+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
4545
} else
4646
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
4747

‎R/minMaxRandDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ minMaxRandDS <- function(input.var.name){ #START FUNC
2222

2323
# back-up current .Random.seed and revert on.exit
2424
if (exists(x = ".Random.seed", envir = globalenv())) {
25-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
26-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
25+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
26+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
2727
} else
2828
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
2929

‎R/rangeDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
rangeDS <- function(xvect) {
1111
# back-up current .Random.seed and revert on.exit
1212
if (exists(x = ".Random.seed", envir = globalenv())) {
13-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
14-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
13+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
14+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
1515
} else
1616
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
1717

‎R/scatterPlotDS.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ scatterPlotDS <- function(x, y, method.indicator, k, noise){
4545

4646
# back-up current .Random.seed and revert on.exit
4747
if (exists(x = ".Random.seed", envir = globalenv())) {
48-
assign(x = "old_seed", value = .Random.seed, envir = parent.frame());
49-
on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE)
48+
assign(x = ".old_seed", value = .Random.seed, envir = parent.frame());
49+
on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE)
5050
} else
5151
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
5252

0 commit comments

Comments
 (0)