enabling passing directely the configuration list to create.cctable()

ropensci-archive · Nov 7, 2016 · 1320b0b · 1320b0b
1 parent 6c8486e
commit 1320b0b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 22 deletions.
diff --git a/R/ccTable.R b/R/ccTable.R
@@ -45,15 +45,18 @@ show = function() {
 
 #' construct function of ccTable object
 #' @param rec ccRecord
-#' @param conf the path of YAML configuration file.
+#' @param conf either the path of YAML configuration file or the configuration
+#'        structure in list.
 #' @param freq the data cadence in hour.
 #' @return ccTable object
 #' @export create.cctable
 create.cctable <- function(rec, freq, conf=NULL) {
     if (is.null(conf)) 
         conf <- ccdata:::ITEM_REF
-    else 
-        conf <- yaml.load_file(conf)
+    else { 
+        if (is.character(conf))
+            conf <- yaml.load_file(conf)
+    }
 
     cct <- ccTable(record=rec, conf=conf)
     cct$create.table(freq)

diff --git a/R/create2dclean.r b/R/create2dclean.r
@@ -1,5 +1,5 @@
 .create2dclean <- function(record, config, freq) {
-        dt.sofa <- create.cctable(conf=config, record=record, freq=freq)
+        dt.sofa <- create.cctable(rec=record, conf=config, freq=freq)
         dt.sofa$filter.ranges()
         dt.sofa$filter.category()
         dt.sofa$filter.missingness()

diff --git a/man/create.cctable.Rd b/man/create.cctable.Rd
diff --git a/man/selectIndex.Rd b/man/selectIndex.Rd