From 85a55295729a9d460b6d252e8d65566ab5d7f4cf Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 13 Aug 2025 09:41:40 +0100 Subject: [PATCH 1/4] Switch back to 'banana' --- inst/DATASHIELD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/DATASHIELD b/inst/DATASHIELD index bd17fe82..c9dd9390 100644 --- a/inst/DATASHIELD +++ b/inst/DATASHIELD @@ -163,7 +163,7 @@ AssignMethods: unlist=base::unlist Options: datashield.privacyLevel=5, - default.datashield.privacyControlLevel="permissive", + default.datashield.privacyControlLevel="banana", default.nfilter.glm=0.33, default.nfilter.kNN=3, default.nfilter.string=80, @@ -172,4 +172,4 @@ Options: default.nfilter.tab=3, default.nfilter.noise=0.25, default.nfilter.levels.density=0.33, - default.nfilter.levels.max=40 \ No newline at end of file + default.nfilter.levels.max=40 From bd483bdad2ead018bd9c6030659ab11e80ef1e55 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 13 Aug 2025 21:08:31 +0100 Subject: [PATCH 2/4] Rework access to 'old_seed' --- R/rangeDS.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/rangeDS.R b/R/rangeDS.R index 9c391b69..a32d7a90 100644 --- a/R/rangeDS.R +++ b/R/rangeDS.R @@ -11,7 +11,7 @@ rangeDS <- function(xvect) { # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + on.exit({ assign(x = ".Random.seed", value = parent.frame()$old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) From 90dcb61539d3689742911d9474b58ed7c8ec86f0 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 13 Aug 2025 22:23:07 +0100 Subject: [PATCH 3/4] Update global.R --- R/global.R | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/R/global.R b/R/global.R index 302a35b1..0d6a702f 100644 --- a/R/global.R +++ b/R/global.R @@ -2,5 +2,4 @@ utils::globalVariables(c('offset.to.use', 'weights.to.use', 'out.table.real', 'out.table.dim', 'out.table.dimnames', 'list.obj', 'mg', 'blackbox.output.df', 'blackbox.ranks.df', 'global.bounds.df', 'global.ranks.quantiles.df', 'sR4.df', - 'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','.Random.seed')) - + 'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','old_seed','.Random.seed')) From c81e5ed10c0cd40779597b0949cf4795726361db Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 13 Aug 2025 23:34:34 +0100 Subject: [PATCH 4/4] Switch 'old_seed' to '.old_seed' --- R/blackBoxDS.R | 4 ++-- R/blackBoxRanksDS.R | 4 ++-- R/global.R | 2 +- R/heatmapPlotDS.R | 4 ++-- R/histogramDS1.R | 4 ++-- R/histogramDS2.R | 4 ++-- R/minMaxRandDS.R | 4 ++-- R/rangeDS.R | 4 ++-- R/scatterPlotDS.R | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/R/blackBoxDS.R b/R/blackBoxDS.R index a2ac1efc..63cf0160 100644 --- a/R/blackBoxDS.R +++ b/R/blackBoxDS.R @@ -68,8 +68,8 @@ blackBoxDS <- function(input.var.name=NULL, # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/blackBoxRanksDS.R b/R/blackBoxRanksDS.R index 27a85778..522307a8 100644 --- a/R/blackBoxRanksDS.R +++ b/R/blackBoxRanksDS.R @@ -63,8 +63,8 @@ blackBoxRanksDS <- function(input.var.name=NULL, shared.seedval){ #START FUNC # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/global.R b/R/global.R index 0d6a702f..a3c9454e 100644 --- a/R/global.R +++ b/R/global.R @@ -2,4 +2,4 @@ utils::globalVariables(c('offset.to.use', 'weights.to.use', 'out.table.real', 'out.table.dim', 'out.table.dimnames', 'list.obj', 'mg', 'blackbox.output.df', 'blackbox.ranks.df', 'global.bounds.df', 'global.ranks.quantiles.df', 'sR4.df', - 'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','old_seed','.Random.seed')) + 'min.max.df','sR5.df','input.mean.sd.df','input.ranks.sd.df','RS','CG','mixed','x','y','.old_seed','.Random.seed')) diff --git a/R/heatmapPlotDS.R b/R/heatmapPlotDS.R index 68302392..349f57b9 100644 --- a/R/heatmapPlotDS.R +++ b/R/heatmapPlotDS.R @@ -40,8 +40,8 @@ heatmapPlotDS <- function(x, y, k, noise, method.indicator){ # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/histogramDS1.R b/R/histogramDS1.R index c5f68d41..71ffc439 100644 --- a/R/histogramDS1.R +++ b/R/histogramDS1.R @@ -38,8 +38,8 @@ histogramDS1 <- function(xvect, method.indicator, k, noise){ # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/histogramDS2.R b/R/histogramDS2.R index cffed190..001ab0dd 100644 --- a/R/histogramDS2.R +++ b/R/histogramDS2.R @@ -40,8 +40,8 @@ histogramDS2 <- function (xvect, num.breaks, min, max, method.indicator, k, nois # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/minMaxRandDS.R b/R/minMaxRandDS.R index e6ccfc82..64caf7ae 100644 --- a/R/minMaxRandDS.R +++ b/R/minMaxRandDS.R @@ -22,8 +22,8 @@ minMaxRandDS <- function(input.var.name){ #START FUNC # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/rangeDS.R b/R/rangeDS.R index a32d7a90..ec9183ea 100644 --- a/R/rangeDS.R +++ b/R/rangeDS.R @@ -10,8 +10,8 @@ rangeDS <- function(xvect) { # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = parent.frame()$old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE) diff --git a/R/scatterPlotDS.R b/R/scatterPlotDS.R index 62fbc6a6..ab48be10 100644 --- a/R/scatterPlotDS.R +++ b/R/scatterPlotDS.R @@ -45,8 +45,8 @@ scatterPlotDS <- function(x, y, method.indicator, k, noise){ # back-up current .Random.seed and revert on.exit if (exists(x = ".Random.seed", envir = globalenv())) { - assign(x = "old_seed", value = .Random.seed, envir = parent.frame()); - on.exit({ assign(x = ".Random.seed", value = old_seed, envir = globalenv()); remove("old_seed", envir = parent.frame()) }, add = TRUE) + assign(x = ".old_seed", value = .Random.seed, envir = parent.frame()); + on.exit({ assign(x = ".Random.seed", value = parent.frame()$.old_seed, envir = globalenv()); remove(".old_seed", envir = parent.frame()) }, add = TRUE) } else on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)