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

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

Author: jarioksa
Date: 2012-02-28 16:48:55 +0100 (Tue, 28 Feb 2012)
New Revision: 2111

Modified:
   branches/2.0/R/centroids.cca.R
   branches/2.0/inst/ChangeLog
Log:
merge r2110: fix dropping level names when the only constraint was a 2-level factor

Modified: branches/2.0/R/centroids.cca.R
===================================================================
--- branches/2.0/R/centroids.cca.R	2012-02-28 15:45:21 UTC (rev 2110)
+++ branches/2.0/R/centroids.cca.R	2012-02-28 15:48:55 UTC (rev 2111)
@@ -19,7 +19,7 @@
         for(i in 1:length(tmp)) {
             names(tmp[[i]]) <- paste(pnam[i], names(tmp[[i]]), sep="")
             out <- c(out, tmp[[i]])
-            out <- matrix(out, nrow=1)
+            out <- matrix(out, nrow=1, dimnames = list(NULL, names(out)))
         }  
     } else {
         for (i in 1:length(tmp)) {

Modified: branches/2.0/inst/ChangeLog
===================================================================
--- branches/2.0/inst/ChangeLog	2012-02-28 15:45:21 UTC (rev 2110)
+++ branches/2.0/inst/ChangeLog	2012-02-28 15:48:55 UTC (rev 2111)
@@ -5,6 +5,8 @@
 Version 2.0-3 (opened November 13, 2011)
 
 	* copy simper.R & simper.Rd at r2092.
+	* merge r2110: centroids.cca fix for 2-level factors as the only
+	constraint.
 	* merge r2106: merge scores and vegdist doc updates from github.
 	* merge r2105: pacify -pedantic C compiler in vegdist.
 	* merge r2104: add Cao index in vegdist.