[Mboost-commits] r812 - in pkg/mboostPatch: . R man

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

Author: hofner
Date: 2014-11-26 18:57:41 +0100 (Wed, 26 Nov 2014)
New Revision: 812

Modified:
   pkg/mboostPatch/NAMESPACE
   pkg/mboostPatch/R/methods.R
   pkg/mboostPatch/R/stabsel.R
   pkg/mboostPatch/man/methods.Rd
Log:
- moved generic function selected to stabs (which is imported anyway)

Modified: pkg/mboostPatch/NAMESPACE
===================================================================
--- pkg/mboostPatch/NAMESPACE	2014-11-26 08:42:24 UTC (rev 811)
+++ pkg/mboostPatch/NAMESPACE	2014-11-26 17:57:41 UTC (rev 812)
@@ -21,7 +21,7 @@
        ExpectReg, NBinomial, PropOdds, Weibull, Loglog, Lognormal, AUC, mboost_fit,
        Huber, AdaExp, Gehan, CoxPH, Hurdle, Multinomial, FP, IPCweights,
        cvrisk, cv, bbs,
-       bols, bspatial, brandom, btree, bss, bns, brad, bmono, bmrf, buser, survFit, selected,
+       bols, bspatial, brandom, btree, bss, bns, brad, bmono, bmrf, buser, survFit, selected.mboost,
        nuisance, "%+%", "%X%", "%O%", extract, risk, "mstop<-",
        stabsel.mboost, stabsel_parameters.mboost, confint.mboost, confint.glmboost)
        ###, basesel, fitsel)

Modified: pkg/mboostPatch/R/methods.R
===================================================================
--- pkg/mboostPatch/R/methods.R	2014-11-26 08:42:24 UTC (rev 811)
+++ pkg/mboostPatch/R/methods.R	2014-11-26 17:57:41 UTC (rev 812)
@@ -444,10 +444,6 @@
     ret[which]
 }
 
-
-selected <- function(object, ...)
-    UseMethod("selected", object)
-
 selected.mboost <- function(object, ...)
     object$xselect()
 

Modified: pkg/mboostPatch/R/stabsel.R
===================================================================
--- pkg/mboostPatch/R/stabsel.R	2014-11-26 08:42:24 UTC (rev 811)
+++ pkg/mboostPatch/R/stabsel.R	2014-11-26 17:57:41 UTC (rev 812)
@@ -78,7 +78,7 @@
                 sampling.type = sampling.type, assumption = assumption,
                 call = cll)
     ret$call[[1]] <- as.name("stabsel")
-    class(ret) <- c("stabsel", "stabsel_mboost")
+    class(ret) <- c("stabsel_mboost", "stabsel")
     ret
 }
 

Modified: pkg/mboostPatch/man/methods.Rd
===================================================================
--- pkg/mboostPatch/man/methods.Rd	2014-11-26 08:42:24 UTC (rev 811)
+++ pkg/mboostPatch/man/methods.Rd	2014-11-26 17:57:41 UTC (rev 812)
@@ -45,7 +45,6 @@
 \alias{hatvalues.gamboost}
 \alias{hatvalues.glmboost}
 
-\alias{selected}
 \alias{selected.mboost}
 
 \alias{nuisance}