Skip to content

Commit 0c8b202

Browse files
committed
Merge branch 'master' into fix_1738_svm_no_formula
2 parents a458e03 + 95ade2e commit 0c8b202

File tree

129 files changed

+548
-13
lines changed

Some content is hidden

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

129 files changed

+548
-13
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+1-1

NAMESPACE

+1
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,7 @@ export(getHomogeneousEnsembleModels)
862862
export(getHyperPars)
863863
export(getLearnerId)
864864
export(getLearnerModel)
865+
export(getLearnerNote)
865866
export(getLearnerPackages)
866867
export(getLearnerParVals)
867868
export(getLearnerParamSet)

NEWS.md

+1

R/Learner_operators.R

+11
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,17 @@ getLearnerPackages = function(learner) {
4646
return(learner$package)
4747
}
4848

49+
#' @title Get the note for the learner.
50+
#'
51+
#' @description Get the note for the learner.
52+
#' @template arg_learner
53+
#' @return ([character]).
54+
#' @export
55+
#' @family learner
56+
getLearnerNote = function(learner) {
57+
learner = checkLearner(learner)
58+
return(learner$note)
59+
}
4960

5061
#' @title Get the parameter set of the learner.
5162
#'

R/RLearner_classif_cforest.R

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ trainLearner.classif.cforest = function(.learner, .task, .subset,
4040

4141
f = getTaskFormula(.task)
4242
d = getTaskData(.task, .subset)
43+
44+
# default handling necessary because the default of controls is `cforest_unbiased()` which does not allow all parameters (e.g. replace)
4345
defaults = getDefaults(getParamSet(.learner))
4446
if (missing(teststat)) teststat = defaults$teststat
4547
if (missing(testtype)) testtype = defaults$testtype
@@ -50,6 +52,7 @@ trainLearner.classif.cforest = function(.learner, .task, .subset,
5052
fraction, trace, teststat, testtype, mincriterion,
5153
minsplit, minbucket, stump, nresample, maxsurrogate,
5254
maxdepth, savesplitstats)
55+
5356
party::cforest(f, data = d, controls = ctrl, weights = .weights, ...)
5457
}
5558

R/RLearner_regr_cforest.R

+3
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ trainLearner.regr.cforest = function(.learner, .task, .subset, .weights = NULL,
3939

4040
f = getTaskFormula(.task)
4141
d = getTaskData(.task, .subset)
42+
43+
# default handling necessary because the default of controls is `cforest_unbiased()` which does not allow all parameters (e.g. replace)
4244
defaults = getDefaults(getParamSet(.learner))
4345
if (missing(teststat)) teststat = defaults$teststat
4446
if (missing(testtype)) testtype = defaults$testtype
@@ -49,6 +51,7 @@ trainLearner.regr.cforest = function(.learner, .task, .subset, .weights = NULL,
4951
trace, teststat, testtype, mincriterion,
5052
minsplit, minbucket, stump,
5153
nresample, maxsurrogate, maxdepth, savesplitstats)
54+
5255
party::cforest(f, data = d, controls = ctrl, weights = .weights, ...)
5356
}
5457

R/RLearner_regr_crs.R

+1-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ predictLearner.regr.crs = function(.learner, .model, .newdata, ...) {
6464
lwr = attr(pred, "lwr")
6565
attr(pred, "lwr") = NULL
6666
attr(pred, "upr") = NULL
67-
# FIXME: make sure that this is correct, ask Daniel
68-
se = (pred - lwr) * sqrt(.model$task.desc$size) / qnorm(0.95)
67+
se = (pred - lwr) / qnorm(0.95)
6968
cbind(pred, se)
7069
} else {
7170
pred = predict(.model$learner.model, newdata = .newdata, ...)

docs/articles/tutorial/handling_of_spatial_data.html

+42-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/news/index.html

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/LearnerProperties.html

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/benchmark-1.png

-70 Bytes

docs/reference/benchmark-2.png

244 Bytes

docs/reference/benchmark-3.png

25 Bytes

docs/reference/createSpatialResamplingPlots.html

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
272 Bytes
845 Bytes

docs/reference/getClassWeightParam.html

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/getHyperPars.html

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/getLearnerId.html

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)