[Vegan-commits] r1033 - in pkg/vegan: R inst

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

Author: jarioksa
Date: 2009-10-06 18:20:49 +0200 (Tue, 06 Oct 2009)
New Revision: 1033

Modified:
   pkg/vegan/R/ordiParseFormula.R
   pkg/vegan/inst/ChangeLog
Log:
cca(y ~ Condition(z)) failed

Modified: pkg/vegan/R/ordiParseFormula.R
===================================================================
--- pkg/vegan/R/ordiParseFormula.R	2009-10-05 19:39:01 UTC (rev 1032)
+++ pkg/vegan/R/ordiParseFormula.R	2009-10-06 16:20:49 UTC (rev 1033)
@@ -33,7 +33,10 @@
     ## Combine condition an constrain data frames
     if (!is.null(zmf)) {
         ncond <- NCOL(zmf)
-        mf <- cbind(zmf, ymf)
+        if (!is.null(ymf))
+            mf <- cbind(zmf, ymf)
+        else
+            mf <- zmf
     } else {
         ncond <- 0
         mf <- ymf

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2009-10-05 19:39:01 UTC (rev 1032)
+++ pkg/vegan/inst/ChangeLog	2009-10-06 16:20:49 UTC (rev 1033)
@@ -4,6 +4,9 @@
 
 Version 1.16-31 (opened October 3, 2009)
 
+	* constrained ordination (cca, rda, capscale) failed if they only
+	had partial term Condition() without constraints.
+
 	* ordistep: new function for automatic model choice in the cca
 	family of methods. This is similar to step(), but uses permutation
 	P-values instead of AIC (that does not exist for these methods,