travis?

Author: mllg

.Rbuildignore

@@ -6,3 +6,5 @@
 ^\.travis\.yml$
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^\.editorconfig$
+^\.ignore$

.editorconfig

@@ -0,0 +1,21 @@
+# See http://editorconfig.org
+root = true
+
+[*]
+charset = utf8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+trim_trailing_whitespace = true
+
+[*.{r,R,md,Rmd}]
+indent_size = 2
+
+[*.{c,h}]
+indent_size = 4
+
+[*.{cpp,hpp}]
+indent_size = 4
+
+[{NEWS.md,DESCRIPTION,LICENSE}]
+max_line_length = 80

.ignore

@@ -0,0 +1,5 @@
+man/
+docs/
+inst/doc/
+attic/
+vignettes/*.html

DESCRIPTION

@@ -37,10 +37,12 @@ Imports:
     paradox,
     R6
 Suggests:
+    FSelectorRcpp,
     knitr,
+    mlbench,
+    praznik,
     rpart,
-    testthat,
-    covr
+    testthat
 VignetteBuilder:
     knitr
 Remotes:
@@ -53,7 +55,7 @@ LazyData: true
 NeedsCompilation: no
 Roxygen: list(markdown = TRUE)
 RoxygenNote: 6.1.1
-Collate: 
+Collate:
     'Filter.R'
     'FilterAUC.R'
     'FilterCMIM.R'
@@ -70,4 +72,5 @@ Collate:
     'FilterSymmetricalUncertainty.R'
     'FilterVariance.R'
     'helpers.R'
+    'reexports.R'
     'zzz.R'

NAMESPACE

@@ -16,9 +16,11 @@ export(FilterNJMIM)
 export(FilterRankCorrelation)
 export(FilterSymmetricalUncertainty)
 export(FilterVariance)
+export(as.data.table)
 import(checkmate)
 import(data.table, except = transpose)
 import(mlr3)
 import(mlr3misc)
 import(paradox)
 importFrom(R6,R6Class)
+importFrom(utils,head)

R/Filter.R

@@ -39,17 +39,12 @@
 #' * `$settings` is a list of hyperparamter settings for this [Filter].
 #' @name Filter
 #' @family Filter
-#' @examples
-#' filter = Filter$new(id = "FilterLinearCorrelation", package =  "stats",
-#'   feature_types = "numeric", task_type = "regr", settings = list())
-#'
 NULL
 
 #' @export
 Filter = R6Class("Filter",
   public = list(
     id = NULL,
-    task = NULL,
     packages = NULL,
     feature_types = NULL,
     task_type = NULL,
@@ -67,7 +62,7 @@ Filter = R6Class("Filter",
     calculate = function(task, settings = self$settings) {
       assert_task(task)
       assert_feature_types(task, self)
-      assert_filter(filter, task)
+      assert_filter(self, task)
       assert_list(settings, names = "unique")
       require_namespaces(self$packages)
 
@@ -77,26 +72,39 @@ Filter = R6Class("Filter",
       self
     },
 
-    filter = function(abs, perc, threshold) {
-      assert_numeric(self$filter_values)
-      self$filter_values = sort(self$filter_values, decreasing = TRUE)
+    filter_abs = function(task, abs) {
+      assert_count(abs)
+      assert_task(task)
+      if (is.null(self$filter_values))
+        stopf("Filter values have not been computed yet")
+      filter_n(self, task, abs)
+    },
 
-      if (abs) {
-        subs = abs
-      } else if (perc) {
-        subs = round(length(task$feature_names) * perc)
-      } else if (threshold) {
-        subs = length(which(self$filter_values > threshold))
-      }
+    filter_perc = function(task, perc) {
+      assert_number(perc, lower = 0, upper = 1)
+      assert_task(task)
+      if (is.null(self$filter_values))
+        stopf("Filter values have not been computed yet")
+      filter_n(self, task, round(task$nrow * perc))
+    },
 
-      filtered_features = names(head(self$filter_values, subs))
-      task$clone(deep = TRUE)$select(filtered_features)
+    filter_thres = function(task, threshold) {
+      assert_number(threshold)
+      assert_task(task)
+      if (is.null(self$filter_values))
+        stopf("Filter values have not been computed yet")
+      filter_n(self, task, sum(self$filter_values > threshold))
     }
   )
 )
 
+filter_n = function(self, task, n) {
+  filtered_features = names(head(self$filter_values, n))
+  task$clone(deep = TRUE)$select(filtered_features)
+}
+
 #' @export
-as.data.table.Filter = function(x) {
+as.data.table.Filter = function(x, ...) {
   fv = x$filter_values
   if (is.null(fv))
     stopf("No filter data available")

R/FilterAUC.R

@@ -15,7 +15,7 @@
 #' @name FilterAUC
 #' @family Filter
 #' @examples
-#' task = mlr_tasks$get("spam")
+#' task = mlr3::mlr_tasks$get("sonar")
 #' filter = FilterAUC$new()
 #' filter$calculate(task)
 #' head(as.data.table(filter), 3)

R/FilterCMIM.R

@@ -15,7 +15,7 @@
 #' @name FilterCMIM
 #' @family Filter
 #' @examples
-#' task = mlr_tasks$get("iris")
+#' task = mlr3::mlr_tasks$get("iris")
 #' filter = FilterCMIM$new()
 #' filter$calculate(task)
 NULL
@@ -31,20 +31,11 @@ FilterCMIM = R6Class("FilterCMIM", inherit = Filter,
         feature_types = c("numeric", "factor", "ordered"),
         task_type = c("classif", "regr"),
         settings = settings)
-    },
-    calculate = function(task, settings = self$settings) {
-
-      # check for supported features
-      assert_feature_types(task, self)
-      # check for supported task
-      assert_filter(filter, task)
-
-      # check for Namespace
-      require_namespaces(self$packages)
-
-      # assign task to class
-      self$task = task
+    }
+  ),
 
+  private = list(
+    .calculate = function(task, settings) {
       X = task$data(cols = task$feature_names)
       Y = task$data(cols = task$target_names)[[task$target_names]]
       filter_values = invoke(

R/FilterDISR.R

@@ -15,7 +15,7 @@
 #' @name FilterDISR
 #' @family Filter
 #' @examples
-#' task = mlr_tasks$get("iris")
+#' task = mlr3::mlr_tasks$get("iris")
 #' filter = FilterDISR$new()
 #' filter$calculate(task)
 #' head(as.data.table(filter), 3)

R/FilterGainRatio.R

@@ -15,7 +15,7 @@
 #' @name FilterGainRatio
 #' @family Filter
 #' @examples
-#' task = mlr_tasks$get("sonar")
+#' task = mlr3::mlr_tasks$get("sonar")
 #' filter = FilterGainRatio$new()
 #' filter$calculate(task)
 #' head(as.data.table(filter), 3)
@@ -33,7 +33,7 @@ FilterGainRatio = R6Class("FilterGainRatio", inherit = Filter,
         task_type = c("classif", "regr"),
         settings = settings)
     }
-  ), 
+  ),
 
   private = list(
     .calculate = function(task, settings) {