Merge remote-tracking branch 'origin/master' into survival

Author: mllg

NEWS.md

@@ -10,6 +10,9 @@
 * helpLearner, helpLearnerParam: open the help for a learner or get a
   description of its parameters
 
+## measures - general
+* measure "arsq" now has ID "arsq"
+
 ## measures - new
 * measureBER, measureRMSLE, measureF1
 

R/Task_operators.R

@@ -402,10 +402,7 @@ changeData = function(task, data, costs, weights) {
     weights = task$weights
   task$env = new.env(parent = emptyenv())
   task$env$data = data
-  if (is.null(weights))
-    task["weights"] = list(NULL)
-  else
-    task$weights = weights
+  task["weights"] = list(weights)  # so also 'NULL' gets set
   td = task$task.desc
   # FIXME: this is bad style but I see no other way right now
   task$task.desc = switch(td$type,
@@ -414,7 +411,7 @@ changeData = function(task, data, costs, weights) {
     "cluster" = makeClusterTaskDesc(td$id, data, task$weights, task$blocking),
     "surv" = makeSurvTaskDesc(td$id, data, td$target, task$weights, task$blocking),
     "costsens" = makeCostSensTaskDesc(td$id, data, td$target, task$blocking, costs),
-    "multilabel" = makeMultilabelTaskDesc(td$id, data, td$target, td$weights, task$blocking)
+    "multilabel" = makeMultilabelTaskDesc(td$id, data, td$target, task$weights, task$blocking)
   )
 
   return(task)

R/measures.R

@@ -277,7 +277,7 @@ measureEXPVAR = function(truth, response) {
 #' @export arsq
 #' @rdname measures
 #' @format none
-arsq = makeMeasure(id = "adjrsq", minimize = FALSE, best = 1, worst = 0,
+arsq = makeMeasure(id = "arsq", minimize = FALSE, best = 1, worst = 0,
   properties = c("regr", "req.pred", "req.truth"),
   name = "Adjusted coefficient of determination",
   note = "Defined as: 1 - (1 - rsq) * (p / (n - p - 1L)). Adjusted R-squared is only defined for normal linear regression.",

tests/testthat/test_base_weights.R

@@ -27,3 +27,17 @@ test_that("weights", {
 
   expect_error(train(lrn, rger.task, weights = 1:2))
 })
+
+test_that("weights remain after subset", {
+  tasks = list(binaryclass.task, multiclass.task, multilabel.task, regr.task, surv.task, noclass.task)
+  for (t in tasks) {
+    expect_false(getTaskDesc(t)$has.weights)
+    ws = seq_len(getTaskDesc(t)$size)
+    wtask = changeData(t, weights = ws)
+    expect_true(getTaskDesc(wtask)$has.weights)
+    expect_equal(wtask$weights, ws)
+    expect_equal(subsetTask(wtask, 1:10)$weights, 1:10)
+    expect_true(getTaskDesc(subsetTask(wtask, 1:10))$has.weights)
+  }
+})
+