[Vegan-commits] r1221 - in branches/1.17: R inst

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

Author: jarioksa
Date: 2010-06-06 18:21:35 +0200 (Sun, 06 Jun 2010)
New Revision: 1221

Modified:
   branches/1.17/R/scores.rda.R
   branches/1.17/inst/ChangeLog
Log:
merge r1175: code clean-up

Modified: branches/1.17/R/scores.rda.R
===================================================================
--- branches/1.17/R/scores.rda.R	2010-06-06 16:17:43 UTC (rev 1220)
+++ branches/1.17/R/scores.rda.R	2010-06-06 16:21:35 UTC (rev 1221)
@@ -36,7 +36,7 @@
             v <- sweep(v, 2, scal, "*")
             if (scaling < 0) {
                 v <- sweep(v, 1, x$colsum, "/")
-                v <- v * sqrt(x$tot.chi / (max(nrow(x$CA$u), nrow(x$CCA$u)) - 1 ))
+                v <- v * sqrt(sumev / (nr - 1))
             }
             v <- const * v
         }

Modified: branches/1.17/inst/ChangeLog
===================================================================
--- branches/1.17/inst/ChangeLog	2010-06-06 16:17:43 UTC (rev 1220)
+++ branches/1.17/inst/ChangeLog	2010-06-06 16:21:35 UTC (rev 1221)
@@ -33,7 +33,7 @@
 
 	* merge r1176: permutest.cca speed-up in CCA re-weighting.
 
-	* merge r1174: scores.cca/rda always have names.
+	* merge r1174:1175: scores.cca/rda always have names.
 
 	* betadisper: 'type = "median"', the default, was not computing
 	the spatial median on the real and imaginary axes separately.