v0.1.140 Removed dataOrig and dataMod from flags result - had to change filtering function

Author: PoGibas

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: bdchecks
 Title: Biodiversity Data Checks
 Description: Supplies a set of functions to perform and manage data checks for biodiversity data. 
-Version: 0.1.137
-Date: 2019-12-24
+Version: 0.1.140
+Date: 2020-01-01
 License: GPL-3 | file LICENSE
 URL: https://github.com/bd-R/bdchecks
 BugReports: https://github.com/bd-R/bdchecks/issues

R/classes_generics_methods.R

@@ -88,17 +88,10 @@ DataCheckFlag <- setClass(
 #'
 #' @slot DC names of performed data checks
 #' @slot flags list of performed data checks in a DataCheckFlagSet class
-#' @slot dataOrig original data before data checks
-#' @slot dataMod modified data after data checks
 #'
 DataCheckFlagSet <- setClass(
   "DataCheckFlagSet",
-  slots = c(
-    DC = "vector",
-    flags = "list",
-    dataOrig = "data.frame",
-    dataMod = "data.frame"
-  )
+  slots = c(DC = "vector", flags = "list")
 )
 
 #' Show method for DataCheckFlagSet objects

R/filter.R

@@ -37,13 +37,14 @@ dc_filter_generate <- function(dc_result_summary,
 #' `dc_filter()` is a function that filters data check result according
 #'  to filtering vector.
 #'
+#' @param data Data set on which data checks where performed
 #' @param dc_result Object of a DataCheckFlagSet generated with `perforDataCheck()`
 #' @param dc_filts A list containing filtering targets and status generated with
 #' `dc_filter_generate()`
 #'
 #' @return A data.frame that is filtered according to given vector
 #'
-dc_filter <- function(dc_result, dc_filts) {
+dc_filter <- function(data, dc_result, dc_filts) {
   idx <- c()
   names <- sapply(dc_result@flags, function(x) `@`(x, name))
   targets <- sapply(dc_result@flags, function(x) `@`(x, target))
@@ -68,5 +69,5 @@ dc_filter <- function(dc_result, dc_filts) {
     }
   }
   idx <- unique(idx)
-  return(dc_result@dataMod[-idx, ])
+  return(data[-idx, ])
 }

R/perform.R

@@ -79,9 +79,7 @@ perform_dc <- function(data = NULL, wanted_dc = NULL) {
   if (length(result_dc) > 0) {
     result_dc <- methods::new("DataCheckFlagSet",
       DC = as.character(lapply(result_dc, function(x) `@`(x, name))),
-      flags = result_dc,
-      dataOrig = data,
-      dataMod = data
+      flags = result_dc
     )
     return(result_dc)
   } else {