[Mboost-commits] r737 - / pkg/mboostDevel/R pkg/mboostDevel/man

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

Author: hofner
Date: 2013-09-12 16:49:04 +0200 (Thu, 12 Sep 2013)
New Revision: 737

Modified:
   pkg/mboostDevel/R/methods.R
   pkg/mboostDevel/man/mboost_package.Rd
   svn_release.txt
Log:
- added tutorial paper to mboost_package.Rd 
- updated svn release SOPs (--> do not forget to include NEWS in mboost_package.Rd)
- fixed newly introduced bug in extract(BL) 


Modified: pkg/mboostDevel/R/methods.R
===================================================================
--- pkg/mboostDevel/R/methods.R	2013-09-11 06:56:58 UTC (rev 736)
+++ pkg/mboostDevel/R/methods.R	2013-09-12 14:49:04 UTC (rev 737)
@@ -534,7 +534,17 @@
     if (what == "penalty")
         mat <- get("K", envir = environment(object$dpp))
     if (what == "index")
-        mat <- get("index", envir = environment(object$dpp))
+        return(get("index", envir = environment(object$dpp)))
+    ## only applicable for design and penalty matrix
+    if (asmatrix){
+        mat <- as.matrix(mat)
+    }
+    if (expand && !is.null(indx <- extract(object, what = "index"))){
+        a <- attributes(mat)
+        mat <- mat[indx,]
+        a[c("dim", "dimnames")] <- attributes(mat)[c("dim", "dimnames")]
+        attributes(mat) <- a
+    }
     return(mat)
 }
 

Modified: pkg/mboostDevel/man/mboost_package.Rd
===================================================================
--- pkg/mboostDevel/man/mboost_package.Rd	2013-09-11 06:56:58 UTC (rev 736)
+++ pkg/mboostDevel/man/mboost_package.Rd	2013-09-12 14:49:04 UTC (rev 737)
@@ -46,9 +46,12 @@
   determine an appropriate model complexity. This task is the responsibility
   of the data analyst.
 
+  Hofner et al. (2013) present a comprehensive hands-on tutorial for using the
+  package \code{mbost}.
+
   Ben Taieba and Hyndman (2013) used this package for fitting their model in the
   Kaggle Global Energy Forecasting Competition 2012. The corresponding research
-  paper is a very good starting point when you plan to analyse your data using
+  paper is a good starting point when you plan to analyse your data using
   \code{mboost}.
 
 }
@@ -64,17 +67,17 @@
   \code{options(mboost_dftraceS = TRUE)} (see also B. Hofner et al.,
   2011 and \code{\link{bols}}).
 
-  Other important changes inlclude:  
-  \itemize{    
+  Other important changes inlclude:
+  \itemize{
     \item We switched from packages \code{multicore} and \code{snow} to
     \code{parallel}
-    
+
     \item We changed the behavior of \code{bols(x, intercept = FALSE)}
     when \code{x} is a factor: now the intercept is simply dropped from
     the design matrix and the coding can be specified as usually for
     factors. Addtionally, a new contrast is introduced:
     \code{"contr.dummy"} (see \code{\link{bols}} for details).
-    
+
     \item We changed the computation of B-spline basis at the
     boundaries; B-splines now also use equidistant knots in the
     boundaries (per default).
@@ -94,7 +97,7 @@
   Starting from this version, we now also automatically center the
   variables in \code{\link{glmboost}} (argument \code{center = TRUE}).
 
-  A complete list of changes can be found in the NEWS file.      
+  A complete list of changes can be found in the NEWS file.
 }
 \section{NEWS in 2.0-series}{
 
@@ -153,7 +156,8 @@
 
   Souhaib Ben Taieba and Rob J. Hyndman (2013),
   A gradient boosting approach to the Kaggle load forecasting competition.
-  \emph{International Journal of Forecasting}, \url{http://dx.doi.org/10.1016/j.ijforecast.2013.07.00}
+  \emph{International Journal of Forecasting},
+  \url{http://dx.doi.org/10.1016/j.ijforecast.2013.07.005}
 
 }
 

Modified: svn_release.txt
===================================================================
--- svn_release.txt	2013-09-11 06:56:58 UTC (rev 736)
+++ svn_release.txt	2013-09-12 14:49:04 UTC (rev 737)
@@ -83,6 +83,8 @@
     Update Date: field in DESCRIPTION
     Update NEWS
     Update Date and Version in /man/mboost_package.Rd
+    Add a new section "NEWS in X.Y-series" to /man/mboost_package.Rd
+      and explain the most important changes there.
 
     R CMD build --resave-data --compact-vignettes pkg/mboostDevel
     R CMD check --as-cran mboostDevel_XXX.tar.gz