[Vegan-commits] r431 - in branches/1.13: R inst

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

Author: jarioksa
Date: 2008-06-17 08:50:11 +0200 (Tue, 17 Jun 2008)
New Revision: 431

Modified:
   branches/1.13/R/print.summary.cca.R
   branches/1.13/R/scores.rda.R
   branches/1.13/inst/ChangeLog
Log:
merged r428 (display scaling constant in rda/capscale) to 1.13-2

Modified: branches/1.13/R/print.summary.cca.R
===================================================================
--- branches/1.13/R/print.summary.cca.R	2008-06-16 09:55:50 UTC (rev 430)
+++ branches/1.13/R/print.summary.cca.R	2008-06-17 06:50:11 UTC (rev 431)
@@ -56,6 +56,10 @@
             cat("* Species scores divided by species standard deviations\n")
         cat("  so that they no longer are biplot scores\n")
     }
+    if (x$method != "cca") {
+        cat("* General scaling constant of scores: ",
+            attr(x, "const"), "\n")
+    }
     if (!is.null(x$species)) {
         cat("\n\nSpecies scores\n\n")
         hcat(x$species, head=head, tail=tail, digits = digits, ...)

Modified: branches/1.13/R/scores.rda.R
===================================================================
--- branches/1.13/R/scores.rda.R	2008-06-16 09:55:50 UTC (rev 430)
+++ branches/1.13/R/scores.rda.R	2008-06-17 06:50:11 UTC (rev 431)
@@ -80,6 +80,7 @@
     }  
     if (length(sol) == 1) 
         sol <- sol[[1]]
+    attr(sol, "const") <- const
     return(sol)
 }
 

Modified: branches/1.13/inst/ChangeLog
===================================================================
--- branches/1.13/inst/ChangeLog	2008-06-16 09:55:50 UTC (rev 430)
+++ branches/1.13/inst/ChangeLog	2008-06-17 06:50:11 UTC (rev 431)
@@ -5,6 +5,9 @@
 
 Version 1.13-2 (opened June 16, 2008)
 
+	* merged 428: scores.rda returns and summary.cca prints scaling
+	constant in rda/capscale.
+
 	* merged r425: scores.rda scaling=0 really returns unmodified
 	scores like documented.