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

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

Author: jarioksa
Date: 2011-09-28 15:13:37 +0200 (Wed, 28 Sep 2011)
New Revision: 1906

Modified:
   branches/2.0/R/permutest.cca.R
   branches/2.0/inst/ChangeLog
Log:
merge r1843: tiny speed-up in permutest.cca(..., first=TRUE)

Modified: branches/2.0/R/permutest.cca.R
===================================================================
--- branches/2.0/R/permutest.cca.R	2011-09-27 14:29:02 UTC (rev 1905)
+++ branches/2.0/R/permutest.cca.R	2011-09-28 13:13:37 UTC (rev 1906)
@@ -86,7 +86,7 @@
         }
         tmp <- qr.fitted(Q, Y)
         if (first) 
-            cca.ev <- svd(tmp, nv = 0, nu = 0)$d[1]^2
+            cca.ev <- La.svd(tmp, nv = 0, nu = 0)$d[1]^2
         else cca.ev <- sum(tmp * tmp)
         if (isPartial || first) {
             tmp <- qr.resid(Q, Y)

Modified: branches/2.0/inst/ChangeLog
===================================================================
--- branches/2.0/inst/ChangeLog	2011-09-27 14:29:02 UTC (rev 1905)
+++ branches/2.0/inst/ChangeLog	2011-09-28 13:13:37 UTC (rev 1906)
@@ -11,6 +11,7 @@
 	* merge r1869: meandist re-ordering bug fix.
 	* merge r1846: tweak speed (a bit).
 	* merge r1845: faster centroids.cca.
+	* merge r1843: tiny speed-up in permutest.cca(..., first=TRUE) 
 	* merge r1838: a bit faster example(MDSrotate).
 	* merge r1835: add raupcrick.
 	* merge r1811: permatswap bug fix in nestedness.c.