PR: Merge Devel to Master

.travis.yml

@@ -9,6 +9,7 @@
 
 language: r
 sudo: required
+dist: trusty
 
 ## change directory before installation 
 ## as R packages are not available elsewise

DESCRIPTION

@@ -1,16 +1,16 @@
 Package: gamboostLSS
 Type: Package
 Title: Boosting Methods for 'GAMLSS'
-Version: 1.2-2
-Date: 2016-10-18
-Author: Benjamin Hofner, Andreas Mayr, Nora Fenske, Matthias Schmid
+Version: 2.0-0
+Date: 2016-xx-yy
+Author: Benjamin Hofner, Andreas Mayr, Nora Fenske, Janek Thomas, Matthias Schmid
 Maintainer: Benjamin Hofner <benjamin.hofner@fau.de>
 Description: Boosting models for fitting generalized additive models for
   location, shape and scale ('GAMLSS') to potentially high dimensional
   data.
-Depends: R (>= 2.10.0), mboost (>= 2.3-0), parallel
+Depends: R (>= 2.10.0), mboost (>= 2.3-0), stabs (>= 0.5-0), parallel
 Imports: graphics, grDevices, stats, utils
-Suggests: gamlss, BayesX, gamlss.dist, survival, R2BayesX
+Suggests: gamlss, gamlss.dist, survival, BayesX, R2BayesX
 LazyLoad: yes
 LazyData: yes
 License: GPL-2

NAMESPACE

@@ -1,4 +1,5 @@
 import("mboost")
+importFrom("stabs", "stabsel", "subsample", "run_stabsel")
 import("parallel")
 
 importFrom("graphics", "axis", "box", "lines", "plot", "points")
@@ -16,6 +17,8 @@ export(glmboostLSS,
        model.weights,
        PI, predint, plot.predint,
        make.grid, cvrisk.mboostLSS,
+       selected, selected.mboostLSS, selected.stabsel_mboostLSS,
+       stabsel.mboostLSS,
        Families,
        NBinomialLSS, NBinomialMu, NBinomialSigma,
        StudentTLSS, StudentTMu, StudentTSigma, StudentTDf,
@@ -37,6 +40,7 @@ S3method("[", mboostLSS)
 S3method(print, mboostLSS)
 S3method(selected, mboostLSS)
 S3method(risk, mboostLSS)
+S3method(risk, nc_mboostLSS)
 S3method(summary, mboostLSS)
 
 S3method(mstop, oobag)
@@ -46,10 +50,15 @@ S3method(model.weights, default)
 S3method(model.weights, mboostLSS)
 
 S3method(cvrisk, mboostLSS)
+S3method(cvrisk, nc_mboostLSS)
 S3method(print, cvriskLSS)
 S3method(plot, cvriskLSS)
+S3method(plot, nc_cvriskLSS)
 S3method(mstop, cvriskLSS)
 
+S3method(stabsel, mboostLSS)
+S3method(selected, stabsel_mboostLSS)
+
 S3method(coef, mboostLSS)
 S3method(coef, glmboostLSS)
 

R/AAA.R

@@ -3,3 +3,6 @@
     ### the variance of the negative gradient
     options(gamboostLSS_stab_ngrad = FALSE)
 }
+
+# get rid of NOTEs in R CMD check for "undefined global functions or variables"
+globalVariables(c("ngradient", "y", "combined_risk"))