[Vegan-commits] r1458 - in pkg/vegan: R man

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

Author: jarioksa
Date: 2011-01-17 09:19:50 +0100 (Mon, 17 Jan 2011)
New Revision: 1458

Modified:
   pkg/vegan/R/capscale.R
   pkg/vegan/man/capscale.Rd
Log:
vegan failed R CMD check and example(capscale)

Modified: pkg/vegan/R/capscale.R
===================================================================
--- pkg/vegan/R/capscale.R	2011-01-16 18:05:58 UTC (rev 1457)
+++ pkg/vegan/R/capscale.R	2011-01-17 08:19:50 UTC (rev 1458)
@@ -44,8 +44,9 @@
     ## deleted due to missing values)
     fla <- update(formula, X ~ .)
     environment(fla) <- environment()
-    d <- ordiParseFormula(fla, cbind(data, comm), envdepth = 1,
-                          na.action = na.action,
+    d <- ordiParseFormula(fla,
+                          if(is.data.frame(data)) cbind(data, comm) else comm,
+                          envdepth = 1, na.action = na.action,
                           subset = substitute(subset))
     ## ordiParseFormula subsets rows of dissimilarities: do the same
     ## for columns

Modified: pkg/vegan/man/capscale.Rd
===================================================================
--- pkg/vegan/man/capscale.Rd	2011-01-16 18:05:58 UTC (rev 1457)
+++ pkg/vegan/man/capscale.Rd	2011-01-17 08:19:50 UTC (rev 1458)
@@ -21,7 +21,7 @@
 \usage{
 capscale(formula, data, distance = "euclidean", sqrt.dist = FALSE,
     comm = NULL, add = FALSE,  dfun = vegdist, metaMDSdist = FALSE,
-    na.action = na.fail, ...)
+    na.action = na.fail, subset = NULL, ...)
 }
 
 \arguments{