Skip to content

Commit 9ec0e49

Browse files
StuartWheaterStuartWheater
authored
Merge pull request #408 from StuartWheater/v6.3.4-dev-feat_carrot
V6.3.4 dev feat carrot
2 parents 21bb210 + 7ba21e7 commit 9ec0e49

22 files changed

+54
-30
lines changed

‎R/BooleDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
BooleDS <- function(V1.name=NULL, V2.name=NULL, Boolean.operator.n=NULL, na.assign.text, numeric.output=TRUE){
2929

3030
# Check Permissive Privacy Control Level.
31-
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana'))
31+
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana', 'carrot'))
3232

3333
#########################################################################
3434
# DataSHIELD MODULE: CAPTURE THE nfilter SETTINGS #

‎R/blackBoxDS.R‎

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

6969
# back-up current .Random.seed and revert on.exit
70-
old_seed <- .Random.seed
71-
on.exit(.Random.seed <- old_seed, add = TRUE)
70+
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)
73+
} else
74+
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
7275

7376
input.var <- eval(parse(text=input.var.name), envir = parent.frame())
7477

‎R/blackBoxRanksDS.R‎

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

6464
# back-up current .Random.seed and revert on.exit
65-
old_seed <- .Random.seed
66-
on.exit(.Random.seed <- old_seed, add = TRUE)
65+
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)
68+
} else
69+
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
6770

6871
input.var <- eval(parse(text=input.var.name), envir = parent.frame())
6972
input.global.ranks<-input.var

‎R/cbindDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
cbindDS <- function(x.names.transmit=NULL, colnames.transmit=NULL){
2525

2626
# Check Permissive Privacy Control Level.
27-
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana'))
27+
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana', 'carrot'))
2828

2929
x.names.input <- x.names.transmit
3030
x.names.act1 <- unlist(strsplit(x.names.input, split=","))

‎R/dataFrameDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
dataFrameDS <- function(vectors=NULL, r.names=NULL, ch.rows=FALSE, ch.names=TRUE, clnames=NULL, strAsFactors=TRUE, completeCases=FALSE){
4141

4242
# Check Permissive Privacy Control Level.
43-
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana'))
43+
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana', 'carrot'))
4444

4545
#########################################################################
4646
# DataSHIELD MODULE: CAPTURE THE nfilter SETTINGS

‎R/dataFrameSortDS.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
dataFrameSortDS <- function(df.name=NULL,sort.key.name=NULL,sort.descending,sort.method){
3737

3838
# Check Permissive Privacy Control Level.
39-
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana'))
39+
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana', 'carrot'))
4040

4141
#########################################################################
4242
# DataSHIELD MODULE: CAPTURE THE nfilter SETTINGS

‎R/dataFrameSubsetDS1.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
dataFrameSubsetDS1 <- function(df.name=NULL,V1.name=NULL,V2.name=NULL,Boolean.operator.n=NULL,keep.cols=NULL,rm.cols=NULL,keep.NAs=NULL){
5151

5252
# Check Permissive Privacy Control Level.
53-
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana'))
53+
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana', 'carrot'))
5454

5555
#########################################################################
5656
# DataSHIELD MODULE: CAPTURE THE nfilter SETTINGS

‎R/dataFrameSubsetDS2.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
dataFrameSubsetDS2<-function(df.name=NULL,V1.name=NULL, V2.name=NULL, Boolean.operator.n=NULL,keep.cols=NULL, rm.cols=NULL, keep.NAs=NULL){
6060

6161
# Check Permissive Privacy Control Level.
62-
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana'))
62+
dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'banana', 'carrot'))
6363

6464
#########################################################################
6565
# DataSHIELD MODULE: CAPTURE THE nfilter SETTINGS #

‎R/heatmapPlotDS.R‎

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

4141
# back-up current .Random.seed and revert on.exit
42-
old_seed <- .Random.seed
43-
on.exit(.Random.seed <- old_seed, add = TRUE)
42+
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)
45+
} else
46+
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
4447

4548
# Cbind the columns of the two variables and remove any rows that include NAs
4649
data.table <- cbind.data.frame(x, y)

‎R/histogramDS1.R‎

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

3939
# back-up current .Random.seed and revert on.exit
40-
old_seed <- .Random.seed
41-
on.exit(.Random.seed <- old_seed, add = TRUE)
40+
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)
43+
} else
44+
on.exit(if (exists(x = ".Random.seed", envir = globalenv())) remove(".Random.seed", envir = globalenv()), add = TRUE)
4245

4346
# print an error message if the input vector is not a numeric
4447
if(!(is.numeric(xvect))){

0 commit comments

Comments
 (0)