[Vegan-commits] r717 - pkg/vegan/R

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

Author: psolymos
Date: 2009-03-04 06:58:34 +0100 (Wed, 04 Mar 2009)
New Revision: 717

Modified:
   pkg/vegan/R/print.summary.permat.R
   pkg/vegan/R/summary.permat.R
Log:
Chi2 df removed, not trivial what is the no. of fixed parameters


Modified: pkg/vegan/R/print.summary.permat.R
===================================================================
--- pkg/vegan/R/print.summary.permat.R	2009-03-04 05:55:12 UTC (rev 716)
+++ pkg/vegan/R/print.summary.permat.R	2009-03-04 05:58:34 UTC (rev 717)
@@ -34,8 +34,7 @@
         cat("\nSums within strata retained:", round(100 * sum(x$strsum) / n, digits), "%")
     cat("\n\nBray-Curtis dissimilarities among original and permuted matrices:\n")
     print(summary(x$bray))
-    cat("\nChi-squared for original matrix: ", round(attr(x$chisq, "chisq.orig"), digits),
-        " (df = ", attr(x$chisq, "df"), ")\n", sep = "")
+    cat("\nChi-squared for original matrix: ", round(attr(x$chisq, "chisq.orig"), digits), ")\n", sep = "")
     cat("Chi-squared values among expected and permuted matrices:\n")
     print(summary(x$chisq))
 invisible(x)

Modified: pkg/vegan/R/summary.permat.R
===================================================================
--- pkg/vegan/R/summary.permat.R	2009-03-04 05:55:12 UTC (rev 716)
+++ pkg/vegan/R/summary.permat.R	2009-03-04 05:58:34 UTC (rev 717)
@@ -30,7 +30,7 @@
     E <- rs %o% cs / ss
     chisq <- sapply(x$perm, function(z) sum((z - E)^2 / E))
     attr(chisq, "chisq.orig") <- sum((x$orig - E)^2 / E)
-    attr(chisq, "df") <- (nr - 1) * (nc - 1)
+#    attr(chisq, "df") <- (nr - 1) * (nc - 1)
     x$perm <- NULL
     out <- list(x=x, bray=bray, chisq=chisq, sum=psum, fill=pfill, rowsums=vrow, colsums=vcol,
         browsums=brow, bcolsums=bcol, strsum=ssum)