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

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

Author: jarioksa
Date: 2009-09-13 08:53:00 +0200 (Sun, 13 Sep 2009)
New Revision: 1006

Modified:
   pkg/vegan/R/drop1.cca.R
   pkg/vegan/inst/ChangeLog
Log:
drop1.cca did not know 'scope' given as a formula

Modified: pkg/vegan/R/drop1.cca.R
===================================================================
--- pkg/vegan/R/drop1.cca.R	2009-09-13 06:05:32 UTC (rev 1005)
+++ pkg/vegan/R/drop1.cca.R	2009-09-13 06:53:00 UTC (rev 1006)
@@ -9,6 +9,8 @@
         rn <- rownames(out)[-1]
         if (missing(scope))
             scope <- rn
+        else if (!is.character(scope))
+            scope <- drop.scope(scope)
         adds <- anova(object, by = "margin", step = pstep,
                       perm.max = perm.max, scope = scope, ...)
         nr <- nrow(adds)

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2009-09-13 06:05:32 UTC (rev 1005)
+++ pkg/vegan/inst/ChangeLog	2009-09-13 06:53:00 UTC (rev 1006)
@@ -4,6 +4,10 @@
 
 Version 1.16-28 (opened September 10, 200)
 
+	* drop1.cca: 'scope' given as a formula was not recognized and
+	permutation tests were not run. Only character vectors of names
+	worked.  Needs testing.
+
 	* envfit: handles missing values in ordination scores or in
 	environmental variables using na.rm argument.  This also changes
 	the user interface so that 'vectorfit' and 'factorfit' clearly