Skip to content

Commit 2e888f4

Browse files
committed
remove vignettes/pdf, apply precommit fixes
1 parent 5eace84 commit 2e888f4

File tree

154 files changed

+1282
-1322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+1282
-1322
lines changed

.pre-commit-config.yaml

+2-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22
# R specific hooks: https://github.com/lorenzwalthert/precommit
33
repos:
44
- repo: https://github.com/lorenzwalthert/precommit
5-
rev: v0.2.2.9004
5+
rev: v0.2.2.9006
66
hooks:
77
- id: style-files
88
args: [--style_pkg=styler.mlr, --style_fun=mlr_style]
99
additional_dependencies:
1010
- mlr-org/styler.mlr
11-
- id: roxygenize
12-
additional_dependencies:
13-
- git2r
14-
- pkgbuild
1511
- id: use-tidy-description
16-
# - id: spell-check
1712
exclude: >
1813
(?x)^(
1914
data/.*|
@@ -40,7 +35,6 @@ repos:
4035
- id: readme-rmd-rendered
4136
- id: parsable-R
4237
- id: no-browser-statement
43-
- id: deps-in-desc
4438
- repo: https://github.com/pre-commit/pre-commit-hooks
4539
rev: v4.0.1
4640
hooks:
@@ -55,4 +49,5 @@ repos:
5549
entry: Cannot commit .Rhistory, .RData, .Rds or .rds.
5650
language: fail
5751
files: '\.Rhistory|\.RData|\.Rds|\.rds$'
52+
exclude: "gunpoint.RData|yeast.RData"
5853
# `exclude: <regex>` to allow committing specific files.

R/BaseWrapper.R

+1-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ predictLearner.BaseWrapper = function(.learner, .model, .newdata, ...) {
7474
args = removeFromDots(names(.learner$par.vals), ...)
7575
do.call(predictLearner, c(
7676
list(.learner = .learner$next.learner, .model = .model$learner.model$next.model, .newdata = .newdata),
77-
args)
78-
)
77+
args))
7978
}
8079

8180
#' @export

R/Filter.R

+69-35
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ makeFilter(
163163
res = mRMRe::mRMR.classic(data = data, target_indices = target.ind, feature_count = nselect, ...)
164164
scores = as.numeric(mRMRe::scores(res)[[1L]])
165165
setNames(scores, res@feature_names[as.integer(mRMRe::solutions(res)[[1L]])])
166-
})
166+
}
167+
)
167168

168169
# carscore ----------------
169170

@@ -185,7 +186,8 @@ makeFilter(
185186
data = getTaskData(task, target.extra = TRUE)
186187
y = care::carscore(Xtrain = data$data, Ytrain = data$target, verbose = FALSE, ...)^2
187188
setNames(as.double(y), names(y))
188-
})
189+
}
190+
)
189191

190192
# randomForestSRC_importance ----------------
191193

@@ -221,7 +223,8 @@ rf.importance = makeFilter(
221223
y = unname(im)
222224
}
223225
setNames(y, ns)
224-
})
226+
}
227+
)
225228
.FilterRegister[["rf.importance"]] = rf.importance
226229
.FilterRegister[["rf.importance"]]$desc = "(DEPRECATED)"
227230
.FilterRegister[["rf.importance"]]$fun = function(...) {
@@ -247,7 +250,8 @@ randomForestSRC.rfsrc = makeFilter( # nolint
247250
y = unname(im)
248251
}
249252
setNames(y, ns)
250-
})
253+
}
254+
)
251255
.FilterRegister[["randomForestSRC.rfsrc"]] = randomForestSRC.rfsrc
252256
.FilterRegister[["randomForestSRC.rfsrc"]]$desc = "(DEPRECATED)"
253257
.FilterRegister[["randomForestSRC.rfsrc"]]$fun = function(...) {
@@ -274,7 +278,8 @@ rf.min.depth = makeFilter(
274278
supported.features = c("numerics", "factors", "ordered"),
275279
fun = function(task, nselect, method = "md", ...) {
276280
# redirected to randomForestSRC.var.select()
277-
})
281+
}
282+
)
278283
.FilterRegister[["rf.min.depth"]] = rf.min.depth
279284
.FilterRegister[["rf.min.depth"]]$desc = "(DEPRECATED)"
280285
.FilterRegister[["rf.min.depth"]]$fun = function(...) {
@@ -297,7 +302,8 @@ randomForestSRC.var.select = makeFilter( # nolint
297302

298303
im$varselect[setdiff(rownames(im$varselect), im$topvars), "depth"] = NA
299304
setNames(im$varselect[, "depth"], rownames(im$varselect))
300-
})
305+
}
306+
)
301307
.FilterRegister[["randomForestSRC.var.select"]] = randomForestSRC.var.select
302308
.FilterRegister[["randomForestSRC.var.select"]]$desc = "(DEPRECATED)"
303309
.FilterRegister[["randomForestSRC.var.select"]]$fun = function(...) {
@@ -342,7 +348,8 @@ makeFilter(
342348
cforest.args))
343349
im = do.call(party::varimp, c(list(obj = fit), varimp.args))
344350
im
345-
})
351+
}
352+
)
346353

347354
cforest.importance = makeFilter(
348355
name = "party_cforest.importance",
@@ -370,7 +377,8 @@ cforest.importance = makeFilter(
370377
cforest.args))
371378
im = do.call(party::varimp, c(list(obj = fit), varimp.args))
372379
im
373-
})
380+
}
381+
)
374382

375383
.FilterRegister[["cforest.importance"]] = cforest.importance
376384
.FilterRegister[["cforest.importance"]]$desc = "(DEPRECATED)"
@@ -407,7 +415,8 @@ makeFilter(
407415
keep.forest = FALSE, importance = (type != 2L))
408416
im = randomForest::importance(rf, type = type, ...)
409417
setNames(im, rownames(im))
410-
})
418+
}
419+
)
411420

412421
randomForest.importance = makeFilter( # nolint
413422
name = "randomForest_importance",
@@ -423,7 +432,8 @@ randomForest.importance = makeFilter( # nolint
423432
keep.forest = FALSE, importance = (type != 2L))
424433
im = randomForest::importance(rf, type = type, ...)
425434
setNames(im, rownames(im))
426-
})
435+
}
436+
)
427437

428438
.FilterRegister[["randomForest.importance"]] = randomForest.importance
429439
.FilterRegister[["randomForest.importance"]]$desc = "(DEPRECATED)"
@@ -450,7 +460,8 @@ makeFilter(
450460
fun = function(task, nselect, ...) {
451461
data = getTaskData(task, target.extra = TRUE)
452462
abs(cor(as.matrix(data$data), data$target, use = "pairwise.complete.obs", method = "pearson")[, 1L])
453-
})
463+
}
464+
)
454465

455466
# rank.correlation ----------------
456467

@@ -470,7 +481,8 @@ makeFilter(
470481
fun = function(task, nselect, ...) {
471482
data = getTaskData(task, target.extra = TRUE)
472483
abs(cor(as.matrix(data$data), data$target, use = "pairwise.complete.obs", method = "spearman")[, 1L])
473-
})
484+
}
485+
)
474486

475487
# FSelector_information.gain ----------------
476488

@@ -488,7 +500,8 @@ makeFilter(
488500
fun = function(task, nselect, ...) {
489501
y = FSelector::information.gain(getTaskFormula(task), data = getTaskData(task))
490502
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
491-
})
503+
}
504+
)
492505

493506
information.gain = makeFilter(
494507
name = "FSelector_information.gain",
@@ -499,7 +512,8 @@ information.gain = makeFilter(
499512
fun = function(task, nselect, ...) {
500513
y = FSelector::information.gain(getTaskFormula(task), data = getTaskData(task))
501514
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
502-
})
515+
}
516+
)
503517

504518
.FilterRegister[["information.gain"]] = information.gain
505519
.FilterRegister[["information.gain"]]$desc = "(DEPRECATED)"
@@ -525,7 +539,8 @@ makeFilter(
525539
fun = function(task, nselect, ...) {
526540
y = FSelector::gain.ratio(getTaskFormula(task), data = getTaskData(task))
527541
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
528-
})
542+
}
543+
)
529544

530545
gain.ratio = makeFilter(
531546
name = "FSelector_gain.ratio",
@@ -536,7 +551,8 @@ gain.ratio = makeFilter(
536551
fun = function(task, nselect, ...) {
537552
y = FSelector::gain.ratio(getTaskFormula(task), data = getTaskData(task))
538553
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
539-
})
554+
}
555+
)
540556

541557
.FilterRegister[["gain.ratio"]] = gain.ratio
542558
.FilterRegister[["gain.ratio"]]$desc = "(DEPRECATED)"
@@ -561,7 +577,8 @@ makeFilter(
561577
fun = function(task, nselect, ...) {
562578
y = FSelector::symmetrical.uncertainty(getTaskFormula(task), data = getTaskData(task))
563579
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
564-
})
580+
}
581+
)
565582

566583
symmetrical.uncertainty = makeFilter(
567584
name = "FSelector_symmetrical.uncertainty",
@@ -572,7 +589,8 @@ symmetrical.uncertainty = makeFilter(
572589
fun = function(task, nselect, ...) {
573590
y = FSelector::symmetrical.uncertainty(getTaskFormula(task), data = getTaskData(task))
574591
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
575-
})
592+
}
593+
)
576594

577595
.FilterRegister[["symmetrical.uncertainty"]] = symmetrical.uncertainty
578596
.FilterRegister[["symmetrical.uncertainty"]]$desc = "(DEPRECATED)"
@@ -603,7 +621,8 @@ makeFilter(
603621
fun = function(task, nselect, ...) {
604622
y = FSelector::chi.squared(getTaskFormula(task), data = getTaskData(task))
605623
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
606-
})
624+
}
625+
)
607626

608627
chi.squared = makeFilter(
609628
name = "FSelector_chi.squared",
@@ -614,7 +633,8 @@ chi.squared = makeFilter(
614633
fun = function(task, nselect, ...) {
615634
y = FSelector::chi.squared(getTaskFormula(task), data = getTaskData(task))
616635
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
617-
})
636+
}
637+
)
618638

619639
.FilterRegister[["chi.squared"]] = chi.squared
620640
.FilterRegister[["chi.squared"]]$desc = "(DEPRECATED)"
@@ -652,7 +672,8 @@ makeFilter(
652672
fun = function(task, nselect, ...) {
653673
y = FSelector::relief(getTaskFormula(task), data = getTaskData(task), ...)
654674
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
655-
})
675+
}
676+
)
656677

657678
relief = makeFilter(
658679
name = "FSelector_relief",
@@ -663,7 +684,8 @@ relief = makeFilter(
663684
fun = function(task, nselect, ...) {
664685
y = FSelector::relief(getTaskFormula(task), data = getTaskData(task), ...)
665686
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
666-
})
687+
}
688+
)
667689

668690
.FilterRegister[["relief"]] = relief
669691
.FilterRegister[["relief"]]$desc = "(DEPRECATED)"
@@ -693,7 +715,8 @@ makeFilter(
693715
fun = function(task, nselect, ...) {
694716
y = FSelector::oneR(getTaskFormula(task), data = getTaskData(task))
695717
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
696-
})
718+
}
719+
)
697720

698721
oneR = makeFilter( # nolint
699722
name = "FSelector_oneR",
@@ -704,7 +727,8 @@ oneR = makeFilter( # nolint
704727
fun = function(task, nselect, ...) {
705728
y = FSelector::oneR(getTaskFormula(task), data = getTaskData(task))
706729
setNames(y[["attr_importance"]], getTaskFeatureNames(task))
707-
})
730+
}
731+
)
708732

709733
.FilterRegister[["oneR"]] = oneR
710734
.FilterRegister[["oneR"]]$desc = "(DEPRECATED)"
@@ -768,7 +792,8 @@ univariate = makeFilter(
768792
res = -1.0 * res
769793
}
770794
setNames(res, fns)
771-
})
795+
}
796+
)
772797
.FilterRegister[["univariate"]] = univariate
773798
.FilterRegister[["univariate"]]$desc = "(DEPRECATED)"
774799
.FilterRegister[["univariate"]]$fun = function(...) {
@@ -799,7 +824,8 @@ makeFilter(
799824
aov.t = aov(f, data = data)
800825
summary(aov.t)[[1L]][1L, "F value"]
801826
})
802-
})
827+
}
828+
)
803829

804830
# kruskal.test ----------------
805831

@@ -827,7 +853,8 @@ makeFilter(
827853
t = kruskal.test(f, data = data)
828854
unname(t$statistic)
829855
})
830-
})
856+
}
857+
)
831858

832859
# variance ----------------
833860

@@ -850,7 +877,8 @@ makeFilter(
850877
sapply(getTaskFeatureNames(task), function(feat.name) {
851878
var(data[[feat.name]], na.rm = na.rm)
852879
})
853-
})
880+
}
881+
)
854882

855883
# permutation.importance ----------------
856884

@@ -882,7 +910,8 @@ makeFilter(
882910
imp = as.numeric(imp$res)
883911
names(imp) = getTaskFeatureNames(task)
884912
return(imp)
885-
})
913+
}
914+
)
886915

887916
# auc ----------------
888917

@@ -908,7 +937,8 @@ makeFilter(
908937
measureAUC(x, y, task$task.desc$negative, task$task.desc$positive)
909938
}, y = data$target)
910939
abs(0.5 - score)
911-
})
940+
}
941+
)
912942

913943
#' Filters from the package \pkg{praznik} use the mutual information criteria in a greedy forward fashion:
914944
#' \dQuote{praznik_CMIM}, \dQuote{praznik_DISR}, \dQuote{praznik_JMIM}, \dQuote{praznik_JMI},
@@ -1071,7 +1101,7 @@ makeFilter(
10711101
res = setNames(res$importance, res$attributes)
10721102
replace(res, is.nan(res), 0) # FIXME: this is a technical fix, need to report upstream
10731103
}
1074-
)
1104+
)
10751105

10761106
# FSelectorRcpp_info.gain ----------------
10771107

@@ -1127,7 +1157,8 @@ makeFilter(
11271157
lrn = makeLearner(lrn.type, importance = "permutation", ...)
11281158
mod = train(lrn, task)
11291159
ranger::importance(mod$learner.model)
1130-
})
1160+
}
1161+
)
11311162

11321163
ranger.permutation = makeFilter(
11331164
name = "ranger_permutation",
@@ -1140,7 +1171,8 @@ ranger.permutation = makeFilter(
11401171
lrn = makeLearner(lrn.type, importance = "permutation", ...)
11411172
mod = train(lrn, task)
11421173
ranger::importance(mod$learner.model)
1143-
})
1174+
}
1175+
)
11441176

11451177
.FilterRegister[["ranger.permutation"]] = ranger.permutation
11461178
.FilterRegister[["ranger.permutation"]]$desc = "(DEPRECATED)"
@@ -1170,7 +1202,8 @@ makeFilter(
11701202
lrn = makeLearner(lrn.type, importance = "impurity", ...)
11711203
mod = train(lrn, task)
11721204
ranger::importance(mod$learner.model)
1173-
})
1205+
}
1206+
)
11741207

11751208
ranger.impurity = makeFilter(
11761209
name = "ranger_impurity",
@@ -1183,7 +1216,8 @@ ranger.impurity = makeFilter(
11831216
lrn = makeLearner(lrn.type, importance = "impurity", ...)
11841217
mod = train(lrn, task)
11851218
ranger::importance(mod$learner.model)
1186-
})
1219+
}
1220+
)
11871221

11881222

11891223
.FilterRegister[["ranger.impurity"]] = ranger.impurity

0 commit comments

Comments
 (0)