[Mboost-commits] r815 - / pkg/mboostPatch pkg/mboostPatch/man

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

Author: hofner
Date: 2014-12-09 11:56:53 +0100 (Tue, 09 Dec 2014)
New Revision: 815

Modified:
   pkg/mboostPatch/DESCRIPTION
   pkg/mboostPatch/man/Family.Rd
   pkg/mboostPatch/man/baselearners.Rd
   svn_release.txt
Log:
make R-devel happy:
some code in \donttest was not running and dependencies were not properly specified

Modified: pkg/mboostPatch/DESCRIPTION
===================================================================
--- pkg/mboostPatch/DESCRIPTION	2014-11-26 17:57:47 UTC (rev 814)
+++ pkg/mboostPatch/DESCRIPTION	2014-12-09 10:56:53 UTC (rev 815)
@@ -18,7 +18,7 @@
 Depends: R (>= 2.14.0), methods, stats, parallel, stabs
 Imports: Matrix, survival, splines, lattice, nnls, quadprog, utils
 Suggests: party (>= 1.0-3), TH.data, MASS, fields, BayesX, gbm, mlbench,
-        RColorBrewer, rpart (>= 4.0-3)
+        RColorBrewer, rpart (>= 4.0-3), randomForest, nnet
 LazyData: yes
 License: GPL-2
 URL: http://mboost.r-forge.r-project.org/

Modified: pkg/mboostPatch/man/Family.Rd
===================================================================
--- pkg/mboostPatch/man/Family.Rd	2014-11-26 17:57:47 UTC (rev 814)
+++ pkg/mboostPatch/man/Family.Rd	2014-12-09 10:56:53 UTC (rev 815)
@@ -289,10 +289,12 @@
     head(round(predict(mlm, type = "response"), 2))
 
     \donttest{
-    ### compare results with nnet::multinom
-    mlmn <- multinom(Species ~ Sepal.Length, data = iris)
-    max(abs(fitted(mlm[1000], type = "response") -
-            fitted(mlmn, type = "prob")))
+    if (require("nnet")) {
+        ### compare results with nnet::multinom
+        mlmn <- multinom(Species ~ Sepal.Length, data = iris)
+        max(abs(fitted(mlm[1000], type = "response") -
+                fitted(mlmn, type = "prob")))
+        }
     }
 
 }

Modified: pkg/mboostPatch/man/baselearners.Rd
===================================================================
--- pkg/mboostPatch/man/baselearners.Rd	2014-11-26 17:57:47 UTC (rev 814)
+++ pkg/mboostPatch/man/baselearners.Rd	2014-12-09 10:56:53 UTC (rev 815)
@@ -590,7 +590,6 @@
   plot(mod1)
 
   mod2 <- gamboost(form2)
-  x11()
   ## automated plot function:
   plot(mod2)
   ## plot sum of linear and smooth effects:

Modified: svn_release.txt
===================================================================
--- svn_release.txt	2014-11-26 17:57:47 UTC (rev 814)
+++ svn_release.txt	2014-12-09 10:56:53 UTC (rev 815)
@@ -168,7 +168,7 @@
 
   Run
     install.packages(c("party", "TH.data", "fields", "BayesX", "gbm",
-                       "mlbench", "RColorBrewer", "randomForest",
+                       "mlbench", "RColorBrewer", "randomForest", "nnet",
                        "nnls", "quadprog", "stabs"))
 
   Quit R and run