Fixed dstapply. Not all the parent.frames() are needed

R/tapplyDS.R

@@ -28,7 +28,6 @@ nfilter.subset<-as.numeric(thr$nfilter.subset)          				#
 #datashield.privacyLevel<-as.numeric(thr$datashield.privacyLevel)        #
 #########################################################################
 
-
   if(is.character(X.name)){
 	  X<-eval(parse(text=X.name), envir = parent.frame())
 	}else{
@@ -47,7 +46,7 @@ length.test.vector<-rep(NA,num.factors)
 
 for(g in 1:num.factors){
 activation.text.0<-paste0("INDEX.factors[",g,"]")
-active.factor.name<-eval(parse(text=activation.text.0), envir = parent.frame())
+active.factor.name<-eval(parse(text=activation.text.0))
 active.factor<-eval(parse(text=active.factor.name), envir = parent.frame())
 active.factor
 length.test.vector[g]<-length(active.factor)
@@ -71,35 +70,38 @@ all.complete<-stats::complete.cases(X)
 
 current.factor <- NA
 for(j in 1:num.factors){
+
+activation.text.a<-paste0(INDEX.factors[j])
+current.factor <- eval(parse(text=activation.text.a), envir = parent.frame())
+
 
-activation.text.a<-paste0("current.factor <-",INDEX.factors[j])
-eval(parse(text=activation.text.a), envir = parent.frame())
 
 all.complete<-all.complete&stats::complete.cases(current.factor)
 }
 
 X.complete<-X[all.complete]
 
 for(k in 1:num.factors){
-  activation.text.b<-paste0("current.factor <-",INDEX.factors[k])
-  eval(parse(text=activation.text.b), envir = parent.frame())
 
+  activation.text.b<-paste0(INDEX.factors[k])
+  current.factor <- eval(parse(text=activation.text.b), envir = parent.frame())
+
   activation.text.c<-paste0(INDEX.factors[k], "<- current.factor[all.complete]")
-  eval(parse(text=activation.text.c), envir = parent.frame())
+  eval(parse(text=activation.text.c))
  }
 
 #Outcome vector and index factors now all reduced to complete cases only
 
-
 #convert INDEX.names format from transmittable to actionable form (a list of vectors)
    INDEX.names.list<-paste0("list(",INDEX.names.transmit,")")
-   INDEX<-eval(parse(text=INDEX.names.list), envir = parent.frame())
-
+   INDEX<-eval(parse(text=INDEX.names.list))
+   
  ##################
  #disclosure traps#
  ##################
-    N.count <- tapply(X.complete,INDEX,base::length)
-
+
+   N.count <- tapply(X.complete,INDEX,base::length)
+
    if(min(N.count)<nfilter.tab && min(N.count) > 0){
    return.message<-"ERROR: at least one group defined by INDEX has < nfilter.tab members. The output cannot therefore be returned to the clientside. But the function ds.tapply.assign may still be used to write the output to the data servers with no clientside return"
    return(return.message)
@@ -125,8 +127,8 @@ for(k in 1:num.factors){
 
                 factor1.levels <- NA
 		activation.text.e<-paste0("factor1.levels<-levels(",INDEX.factors[1],")")
-		eval(parse(text=activation.text.e), envir = parent.frame())
-
+		eval(parse(text=activation.text.e))
+		
 		factor1.level.names<-factor1.levels
 
 		for(u in 1:length(factor1.levels)){
@@ -140,11 +142,11 @@ for(k in 1:num.factors){
 
                 factor1.levels <- NA
 		activation.text.f<-paste0("factor1.levels<-levels(",INDEX.factors[1],")")
-		eval(parse(text=activation.text.f), envir = parent.frame())
+		eval(parse(text=activation.text.f))
 
                 factor2.levels <- NA
 		activation.text.g<-paste0("factor2.levels<-levels(",INDEX.factors[2],")")
-		eval(parse(text=activation.text.g), envir = parent.frame())
+		eval(parse(text=activation.text.g))
 
 		factor1.level.names<-factor1.levels
 
@@ -182,7 +184,7 @@ for(k in 1:num.factors){
 
                 factor1.levels <- NA
 		activation.text.e<-paste0("factor1.levels<-levels(",INDEX.factors[1],")")
-		eval(parse(text=activation.text.e), envir = parent.frame())
+		eval(parse(text=activation.text.e))
 
 		factor1.level.names<-factor1.levels
 
@@ -197,11 +199,11 @@ for(k in 1:num.factors){
 
                 factor1.levels <- NA
 		activation.text.f<-paste0("factor1.levels<-levels(",INDEX.factors[1],")")
-		eval(parse(text=activation.text.f), envir = parent.frame())
+		eval(parse(text=activation.text.f))
 
                 factor2.levels <- NA
 		activation.text.g<-paste0("factor2.levels<-levels(",INDEX.factors[2],")")
-		eval(parse(text=activation.text.g), envir = parent.frame())
+		eval(parse(text=activation.text.g))
 
 		factor1.level.names<-factor1.levels
 
@@ -239,7 +241,7 @@ for(k in 1:num.factors){
 
                 factor1.levels <- NA
 		activation.text.e<-paste0("factor1.levels<-levels(",INDEX.factors[1],")")
-		eval(parse(text=activation.text.e), envir = parent.frame())
+		eval(parse(text=activation.text.e))
 
 		factor1.level.names<-factor1.levels
 
@@ -254,11 +256,11 @@ for(k in 1:num.factors){
 
                 factor1.levels <- NA
 		activation.text.f<-paste0("factor1.levels<-levels(",INDEX.factors[1],")")
-		eval(parse(text=activation.text.f), envir = parent.frame())
+		eval(parse(text=activation.text.f))
 
                 factor2.levels <- NA
 		activation.text.g<-paste0("factor2.levels<-levels(",INDEX.factors[2],")")
-		eval(parse(text=activation.text.g), envir = parent.frame())
+		eval(parse(text=activation.text.g))
 
 		factor1.level.names<-factor1.levels