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

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

Author: jarioksa
Date: 2010-02-15 07:35:00 +0100 (Mon, 15 Feb 2010)
New Revision: 1124

Modified:
   pkg/vegan/R/envfit.default.R
   pkg/vegan/inst/ChangeLog
Log:
envfit did not pass weights to factorfit or to vectorfit with single vector (reported by Richard Telford)

Modified: pkg/vegan/R/envfit.default.R
===================================================================
--- pkg/vegan/R/envfit.default.R	2010-02-14 07:41:48 UTC (rev 1123)
+++ pkg/vegan/R/envfit.default.R	2010-02-15 06:35:00 UTC (rev 1124)
@@ -36,13 +36,15 @@
             if (!is.null(seed)) {
                 assign(".Random.seed", seed, envir = .GlobalEnv)
             }
-            factors <- factorfit(X, Pfac, permutations, strata,  ...)
+            factors <- factorfit(X, Pfac, permutations, strata,
+                                 choices, w = w, ...)
             sol <- list(vector = vectors, factors = factors)
         }
         else vectors <- vectorfit(X, env, permutations, strata, 
                                   choices, w = w, ...)
     }
-    else vectors <- vectorfit(X, env, permutations, strata, ...)
+    else vectors <- vectorfit(X, env, permutations, strata,
+                              choices, w = w, ...)
     sol <- list(vectors = vectors, factors = factors)
     if (!is.null(na.action))
         sol$na.action <- na.action

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2010-02-14 07:41:48 UTC (rev 1123)
+++ pkg/vegan/inst/ChangeLog	2010-02-15 06:35:00 UTC (rev 1124)
@@ -4,6 +4,10 @@
 
 Version 1.18-1 (opened February 9, 2010)
 
+	* envfit: did not pass weights to factorfit or to vectorfit when
+	the environmental variable was a single vector. Reported for
+	vectors by Richard Telford.
+
 	* CCorA: Fixed bug in presentation of variables in plots. Adds new
 	biplot types. General improvement in checking exceptional cases
 	improve stability.