Merge pull request #44 from boost-R/fix_stabsel_plot

Fix stabsel plot; closes #40
boost-R · May 3, 2017 · 658599c · 658599c
2 parents 88449e3 + 36aee6e
commit 658599c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/R/mboostLSS.R b/R/mboostLSS.R
@@ -182,6 +182,8 @@ mboostLSS_fit <- function(formula, data = list(), families = GaussianLSS(),
             # this is the case for boosting from the beginning
             if (is.null(attr(fit, "combined_risk")) | niter == 0) {
                 combined_risk <- vapply(fit, risk, numeric(1))
+            } else {
+                combined_risk <- attr(fit, "combined_risk")()
             }
 
             best <- which(names(fit) == tail(names(combined_risk), 1))

diff --git a/tests/regtest-noncyclic_fitting.R b/tests/regtest-noncyclic_fitting.R
@@ -169,3 +169,12 @@ model <- glmboostLSS(y ~ ., families = NBinomialLSS(), data = dat,
 selected(model) # ok (at least in principle)
 selected(model, merge = TRUE) ## BROKEN
 
+
+## Check merged risk for reducing mstop to 0, and increasing it again does not contain an NA
+stopifnot(all(!is.na(risk(model, merge = TRUE))))
+mstop(model) <- 0
+stopifnot(all(!is.na(risk(model, merge = TRUE))))
+mstop(model) <- 10
+stopifnot(all(!is.na(risk(model, merge = TRUE))))
+
+