[Vegan-commits] r481 - in pkg: . R inst

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

Author: jarioksa
Date: 2008-08-21 09:55:36 +0200 (Thu, 21 Aug 2008)
New Revision: 481

Modified:
   pkg/DESCRIPTION
   pkg/R/ordiParseFormula.R
   pkg/inst/ChangeLog
Log:
ordiParsefFormula: partial formula is evaluated in the same environment as the general formula

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2008-08-20 12:46:05 UTC (rev 480)
+++ pkg/DESCRIPTION	2008-08-21 07:55:36 UTC (rev 481)
@@ -1,7 +1,7 @@
 Package: vegan
 Title: Community Ecology Package
-Version: 1.14-9
-Date: August 11, 2008
+Version: 1.14-10
+Date: August 21, 2008
 Author: Jari Oksanen, Roeland Kindt, Pierre Legendre, Bob O'Hara, Gavin L. Simpson, 
    Peter Solymos, M. Henry H. Stevens, Helene Wagner  
 Maintainer: Jari Oksanen <jari.oksanen at oulu.fi>

Modified: pkg/R/ordiParseFormula.R
===================================================================
--- pkg/R/ordiParseFormula.R	2008-08-20 12:46:05 UTC (rev 480)
+++ pkg/R/ordiParseFormula.R	2008-08-21 07:55:36 UTC (rev 481)
@@ -12,7 +12,7 @@
         partterm <- attr(Terms, "variables")[1 + indPartial]
         Pterm <- sapply(partterm, function(x) deparse(x[[2]], width.cutoff=500))
         Pterm <- paste(Pterm, collapse = "+")
-        P.formula <- as.formula(paste("~", Pterm))
+        P.formula <- as.formula(paste("~", Pterm), env = environment(formula))
         zlev <- xlev[names(xlev) %in% Pterm]
         mf <- model.frame(P.formula, data, na.action = na.fail, 
             xlev = zlev)
@@ -43,4 +43,3 @@
     list(X = X, Y = Y, Z = Z, terms = terms(fla, width.cutoff = 500), 
         terms.expand = terms(flapart, width.cutoff = 500), modelframe = mf)
 }
-

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2008-08-20 12:46:05 UTC (rev 480)
+++ pkg/inst/ChangeLog	2008-08-21 07:55:36 UTC (rev 481)
@@ -3,8 +3,18 @@
 
 VEGAN DEVEL VERSIONS at http://r-forge.r-project.org/
 
-Version 1.14-9 (open August 10, 2008)
+Version 1.14-10 (opened August 21, 2008: Prague Anniversary)
 
+	* ordiParseFormula: formula of the partial terms has the same
+	environment as the general formula. Cures some tricky issues when
+	the partial term of cca/rda/capscale model is updated within a
+	function. (The environment() drives me crazy, says J.O.)
+	
+Version 1.14-9 (closed August 20, 2008)
+
+	* closed concurrently with the release of vegan 1.13-2: changes up
+	to this version may have been there.
+
 	* adipart: new function to perform additive diversity partitioning
 	with corresponding S3 methods.