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

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

Author: jarioksa
Date: 2008-06-17 08:54:09 +0200 (Tue, 17 Jun 2008)
New Revision: 432

Modified:
   branches/1.13/R/permutest.cca.R
   branches/1.13/inst/ChangeLog
Log:
merged r439 (fix residual df in anova.cca) to 1.13-2

Modified: branches/1.13/R/permutest.cca.R
===================================================================
--- branches/1.13/R/permutest.cca.R	2008-06-17 06:50:11 UTC (rev 431)
+++ branches/1.13/R/permutest.cca.R	2008-06-17 06:54:09 UTC (rev 432)
@@ -22,7 +22,7 @@
     }
     Chi.xz <- x$CA$tot.chi
     names(Chi.xz) <- "Residual"
-    r <- x$CA$rank
+    r <- nrow(x$CA$Xbar) - x$CCA$QR$rank - 1
     if (model == "full") 
         Chi.tot <- Chi.xz
     else Chi.tot <- Chi.z + Chi.xz
@@ -96,4 +96,3 @@
     class(sol) <- "permutest.cca"
     sol
 }
-

Modified: branches/1.13/inst/ChangeLog
===================================================================
--- branches/1.13/inst/ChangeLog	2008-06-17 06:50:11 UTC (rev 431)
+++ branches/1.13/inst/ChangeLog	2008-06-17 06:54:09 UTC (rev 432)
@@ -5,6 +5,8 @@
 
 Version 1.13-2 (opened June 16, 2008)
 
+	* merged 430: fix residual df in permutest.cca/anova.cca.
+
 	* merged 428: scores.rda returns and summary.cca prints scaling
 	constant in rda/capscale.