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

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

Author: jarioksa
Date: 2010-12-02 10:51:02 +0100 (Thu, 02 Dec 2010)
New Revision: 1389

Modified:
   branches/1.17/R/anova.ccanull.R
   branches/1.17/inst/ChangeLog
Log:
merge r1281: df in anova.ccanull

Modified: branches/1.17/R/anova.ccanull.R
===================================================================
--- branches/1.17/R/anova.ccanull.R	2010-12-02 09:38:50 UTC (rev 1388)
+++ branches/1.17/R/anova.ccanull.R	2010-12-02 09:51:02 UTC (rev 1389)
@@ -6,12 +6,12 @@
 {
     table <- matrix(0, nrow = 2, ncol = 5)
     if (is.null(object$CA)) {
-        table[1,] <- c(object$CCA$rank, object$CCA$tot.chi, NA, 0, NA)
+        table[1,] <- c(object$CCA$qrank, object$CCA$tot.chi, NA, 0, NA)
         table[2,] <- c(0,0,NA,NA,NA)
     }
     else {
         table[1,] <- c(0,0,0,0,NA)
-        table[2,] <- c(object$CA$rank, object$CA$tot.chi, NA, NA, NA)
+        table[2,] <- c(nrow(object$CA$u) - 1, object$CA$tot.chi, NA, NA, NA)
     }
     rownames(table) <- c("Model", "Residual")
     colnames(table) <-  c("Df",
@@ -19,11 +19,11 @@
                           "F", "N.Perm", "Pr(>F)")
     table <- as.data.frame(table)
     if (is.null(object$CA))
-        head <- "No residual component"
+        head <- "No residual component\n"
     else if (is.null(object$CCA))
-        head <- "No constrained component"
+        head <- "No constrained component\n"
     else
-        head <- c("!!!!! ERROR !!!!!")
+        head <- c("!!!!! ERROR !!!!!\n")
     head <- c(head, paste("Model:", c(object$call)))
     seed <- get(".Random.seed", envir = .GlobalEnv, inherits = FALSE)
     structure(table, heading = head, Random.seed = seed,

Modified: branches/1.17/inst/ChangeLog
===================================================================
--- branches/1.17/inst/ChangeLog	2010-12-02 09:38:50 UTC (rev 1388)
+++ branches/1.17/inst/ChangeLog	2010-12-02 09:51:02 UTC (rev 1389)
@@ -13,6 +13,9 @@
 
 	* merge r1280: deviance.cca/rda return 0 in unconstrained
 	models.
+
+	* merge r1281: fix anova.ccanull df.
+	
 	* merge r1288:1290, 1305: rankindex takes a list of indices.
 
 	* merge r1296: example on unbiased Simpson in diversity.Rd.
@@ -55,8 +58,9 @@
 	scores.rda, makes treedist to work with zero-height trees and
 	introduces unscaled tree distance, fixes NA handling in capscale
 	with fix in ordiParseFormula(), makes eigenvals to know pcnm and
-	new cmdscale in R 2.12.1, and introduces printing of proportional
-	inertia in print.cca.
+	new cmdscale in R 2.12.1, introduces printing of proportional
+	inertia in print.cca, makes pcnm return its truncated distance
+	matrix. 
 
 Version 1.17-4 (released August 20, 2010)