[Vegan-commits] r401 - branches/1.13/R

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

Author: jarioksa
Date: 2008-06-05 12:39:26 +0200 (Thu, 05 Jun 2008)
New Revision: 401

Modified:
   branches/1.13/R/print.cca.R
Log:
merged r400 for print.cca; cca/rda.default still unfixed

Modified: branches/1.13/R/print.cca.R
===================================================================
--- branches/1.13/R/print.cca.R	2008-06-05 10:35:20 UTC (rev 400)
+++ branches/1.13/R/print.cca.R	2008-06-05 10:39:26 UTC (rev 401)
@@ -4,8 +4,13 @@
     if (inherits(x, "pcaiv")) {
         stop("this is an ade4 object which vegan cannot handle")
     }
-    if (!is.null(x$CCA) && x$CCA$rank < x$CCA$QR$rank)
-        warning("rank of constraints higher than the rank of dependent data\nvegan may not handle this -- wait for a bug fix release", call. = FALSE)
+    if (!is.null(x$CCA)) {
+        qrank <- x$CCA$QR$rank
+        if (!is.null(x$pCCA))
+            qrank <- qrank - x$pCCA$rank
+        if (x$CCA$rank < qrank)
+            warning("rank of constraints higher than the rank of dependent data\nvegan may not handle this -- wait for a bug fix release", call. = FALSE)
+    }
     cat("\nCall:\n")
     cat(deparse(x$call), "\n\n")
     chi <- rbind(x$tot.chi, x$pCCA$tot.chi, x$CCA$tot.chi, x$CA$tot.chi)
@@ -38,4 +43,3 @@
     cat("\n")
     invisible(x)
 }
-