[Mboost-commits] r734 - in pkg/mboostPatch: R inst

[noreply at r-forge.r-project.org]

Author: hofner
Date: 2013-09-10 14:38:11 +0200 (Tue, 10 Sep 2013)
New Revision: 734

Modified:
   pkg/mboostPatch/R/methods.R
   pkg/mboostPatch/inst/CHANGES
Log:
fixed bug in AIC.mboost: df = "actset" can only be used with glmboost models


Modified: pkg/mboostPatch/R/methods.R
===================================================================
--- pkg/mboostPatch/R/methods.R	2013-09-09 09:49:29 UTC (rev 733)
+++ pkg/mboostPatch/R/methods.R	2013-09-10 12:38:11 UTC (rev 734)
@@ -99,6 +99,12 @@
                        df = c("trace", "actset"), ..., k = 2) {
 
     df <- match.arg(df)
+    if (df == "actset" && !inherits(object, "glmboost")) {
+        df <- "trace"
+        warning("df = ", dQuote("actset"), " can only be used with ",
+                sQuote("glmboost"), " models. df = ", dQuote("trace"),
+                " is used instead.")
+    }
     if (df == "trace") {
         hatval <- hatvalues(object)
         RET <- AICboost(object, method = method,

Modified: pkg/mboostPatch/inst/CHANGES
===================================================================
--- pkg/mboostPatch/inst/CHANGES	2013-09-09 09:49:29 UTC (rev 733)
+++ pkg/mboostPatch/inst/CHANGES	2013-09-10 12:38:11 UTC (rev 734)
@@ -1,3 +1,8 @@
+                CHANGES in `mboost' VERSION 2.2-4 (2013-xx-yy, rXYZ)
+
+  o  fixed bug in AIC.mboost: df = "actset" can only be used with glmboost models
+
+
                 CHANGES in `mboost' VERSION 2.2-3 (2013-09-09, r733)
 
   o  fixed bugs in survival families: