[Vegan-commits] r2395 - in branches/2.0: R inst

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

Author: jarioksa
Date: 2013-01-30 17:42:00 +0100 (Wed, 30 Jan 2013)
New Revision: 2395

Modified:
   branches/2.0/R/oecosimu.R
   branches/2.0/inst/ChangeLog
Log:
merge r2394 (partial): handle statistics in data.frame in oecosimu

Modified: branches/2.0/R/oecosimu.R
===================================================================
--- branches/2.0/R/oecosimu.R	2013-01-29 09:17:15 UTC (rev 2394)
+++ branches/2.0/R/oecosimu.R	2013-01-30 16:42:00 UTC (rev 2395)
@@ -119,8 +119,12 @@
     if (any(is.na(z)))
         p[is.na(z)] <- NA
 
-    if (is.null(names(indstat)))
+    if (is.null(names(indstat)) && length(indstat) == 1)
         names(indstat) <- statistic
+    ## $oecosimu cannot be added to a data frame, but this gives
+    ## either an error or a mess
+    if (is.data.frame(ind))
+        ind <- as.list(ind)
     if (!is.list(ind))
         ind <- list(statistic = ind)
     if (method == "custom")

Modified: branches/2.0/inst/ChangeLog
===================================================================
--- branches/2.0/inst/ChangeLog	2013-01-29 09:17:15 UTC (rev 2394)
+++ branches/2.0/inst/ChangeLog	2013-01-30 16:42:00 UTC (rev 2395)
@@ -4,6 +4,9 @@
 
 Version 2.0-6 (opened October 8, 2012)
 
+	* merge 2934 (partial, mc): oecosimu handles nestedfun() returning
+	data.frame. Not merged: checking length of statistic when setting
+	its name.
 	* merge 2384: new FAQ entries.
 	* merge 2383: remove alias to print.wcmdscale.
 	* merge 2374,2376,2378,2382: orditorp gains argument select