revert: remove batch-4 cDS/listDS work leaked onto batch-3

Author: timcadman

R/cDS.R

@@ -3,29 +3,27 @@
 #' @description This function is similar to the R base function 'c'.
 #' @details Unlike the R base function 'c' on vector or list of certain 
 #' length are allowed as output
-#' @param x.names a character vector of object names to concatenate.
+#' @param objs a list which contains the the objects to concatenate.
 #' @return a vector or list
 #' @author Gaye, A.
-#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
 #' @export
-#'
-cDS <- function (x.names) {
-
+#' 
+cDS <- function (objs) {
+  
   # Check Permissive Privacy Control Level.
   dsBase::checkPermissivePrivacyControlLevel(c('permissive', 'avocado'))
-
-  # this filter sets the minimum number of observations that are allowed
+  
+  # this filter sets the minimum number of observations that are allowed 
 
   #############################################################
   # MODULE 1: CAPTURE THE nfilter SETTINGS
   thr <- dsBase::listDisclosureSettingsDS()
   nfilter.tab <- as.numeric(thr$nfilter.tab)
+  #nfilter.glm <- as.numeric(thr$nfilter.glm)
+  #nfilter.subset <- as.numeric(thr$nfilter.subset)
+  #nfilter.string <- as.numeric(thr$nfilter.string)
   #############################################################
-
-  objs <- list()
-  for (i in seq_along(x.names)) {
-    objs[[i]] <- .loadServersideObject(x.names[i])
-  }
+  
   x <-  unlist(objs)
 
   # check if the output is valid and output accordingly

R/listDS.R

@@ -3,21 +3,17 @@
 #' @description this function is similar to R function 'list'
 #' @details Unlike the R function 'list' it takes also a vector of characters,
 #' the names of the elements in the output list.
-#' @param x.names a character vector of object names to coerce into a list.
-#' @param eltnames a character vector, the names of the elements in the list.
+#' @param input a list of objects to coerce into a list
+#' @param eltnames a character list, the names of the elements in the list.
 #' @return a list
 #' @author Gaye, A.
-#' @author Tim Cadman, Genomics Coordination Centre, UMCG, Netherlands
 #' @export
-#'
-listDS <-function (x.names=NULL, eltnames=NULL){
-
-  mylist <- list()
-  for (i in seq_along(x.names)) {
-    mylist[[i]] <- .loadServersideObject(x.names[i])
-  }
+#' 
+listDS <-function (input=NULL, eltnames=NULL){
+  
+  mylist <- input
   names(mylist) <- unlist(eltnames)
 
   return(mylist)
-
+  
 }

man/cDS.Rd

@@ -23,9 +23,9 @@ set.standard.disclosure.settings()
 
 # context("cDS::smk::numeric list")
 test_that("numeric list cDS", {
-    a <- 0.0; b <- 1.0; c <- 2.0; d <- 3.0
+    input <- list(a=0.0, b=1.0, c=2.0, d=3.0)
 
-    res <- cDS(c("a", "b", "c", "d"))
+    res <- cDS(input)
 
     expect_length(res, 4)
     expect_equal(class(res), "numeric")
@@ -37,9 +37,9 @@ test_that("numeric list cDS", {
 
 # context("cDS::smk::character list")
 test_that("character list cDS", {
-    a <- "0.0"; b <- "1.0"; c <- "2.0"; d <- "3.0"
+    input <- list(a="0.0", b="1.0", c="2.0", d="3.0")
 
-    res <- cDS(c("a", "b", "c", "d"))
+    res <- cDS(input)
 
     expect_length(res, 4)
     expect_equal(class(res), "character")
@@ -51,9 +51,9 @@ test_that("character list cDS", {
 
 # context("cDS::smk::numeric list small")
 test_that("single numeric list small cDS", {
-    a <- 0; b <- 1
+    input <- list(a=0, b=1)
 
-    res <- cDS(c("a", "b"))
+    res <- cDS(input)
 
     expect_length(res, 2)
     expect_equal(class(res), "logical")
@@ -63,7 +63,9 @@ test_that("single numeric list small cDS", {
 
 # context("cDS::smk::empty list")
 test_that("empty list cDS", {
-    res <- cDS(character(0))
+    input <- list()
+
+    res <- cDS(input)
 
     expect_length(res, 0)
     expect_equal(class(res), "NULL")

man/listDS.Rd

@@ -21,11 +21,10 @@
 
 # context("listDS::smk::simple")
 test_that("simple listDS", {
-    v1 <- c(1, 2, 3)
-    v2 <- c(4, 5, 6)
+    input    <- list(v1 = c(1, 2, 3), v2 = c(4, 5, 6))
     eltnames <- c('n1', 'n2')
 
-    res <- listDS(c("v1", "v2"), eltnames)
+    res <- listDS(input, eltnames)
 
     expect_equal(class(res), "list")
     expect_length(res, 2)