[Vegan-commits] r556 - in branches/1.15: R inst

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

Author: jarioksa
Date: 2008-11-10 13:12:08 +0100 (Mon, 10 Nov 2008)
New Revision: 556

Modified:
   branches/1.15/R/plot.cca.R
   branches/1.15/inst/ChangeLog
Log:
merged r550,552 (plot.cca when rownames are NULL)

Modified: branches/1.15/R/plot.cca.R
===================================================================
--- branches/1.15/R/plot.cca.R	2008-11-10 09:15:45 UTC (rev 555)
+++ branches/1.15/R/plot.cca.R	2008-11-10 12:12:08 UTC (rev 556)
@@ -6,6 +6,12 @@
     g <- scores(x, choices, display, scaling, const)
     if (!is.list(g)) 
         g <- list(default = g)
+    ## Take care that there are names
+    for (i in 1:length(g)) {
+        if (length(dim(g[[i]])) > 1)
+            rownames(g[[i]]) <- rownames(g[[i]], do.NULL = FALSE,
+                                         prefix = substr(names(g)[i], 1, 3))
+    }
     if (!is.null(g$centroids)) {
         if (is.null(g$biplot)) 
             g$biplot <- scores(x, choices, "bp", scaling)

Modified: branches/1.15/inst/ChangeLog
===================================================================
--- branches/1.15/inst/ChangeLog	2008-11-10 09:15:45 UTC (rev 555)
+++ branches/1.15/inst/ChangeLog	2008-11-10 12:12:08 UTC (rev 556)
@@ -5,6 +5,8 @@
 
 Version 1.15-1 (opened October 10, 2008)
 
+	* merged r550, 552: neat plot.cca when input rownames are NULL.
+
 	* new email address of Peter Solymos in Rd files (from r520).
 
 	* fixed row/column mix-up in permatfull (the bugfix part of r525