[Analogue-commits] r154 - in pkg: . R inst

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

Author: gsimpson
Date: 2009-11-03 21:46:19 +0100 (Tue, 03 Nov 2009)
New Revision: 154

Modified:
   pkg/DESCRIPTION
   pkg/R/tran.R
   pkg/inst/ChangeLog
Log:
bug fix in tran.formula allows pass R CMD check with R 2.10.0

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-11-02 09:45:33 UTC (rev 153)
+++ pkg/DESCRIPTION	2009-11-03 20:46:19 UTC (rev 154)
@@ -1,7 +1,7 @@
 Package: analogue
 Type: Package
 Title: Analogue and weighted averaging methods for palaeoecology
-Version: 0.6-21
+Version: 0.6-22
 Date: $Date$
 Depends: R (>= 2.5.0), stats, graphics, vegan, lattice, MASS
 Author: Gavin L. Simpson, Jari Oksanen

Modified: pkg/R/tran.R
===================================================================
--- pkg/R/tran.R	2009-11-02 09:45:33 UTC (rev 153)
+++ pkg/R/tran.R	2009-11-03 20:46:19 UTC (rev 154)
@@ -61,7 +61,7 @@
     mf[[2]] <- formula(mt, data = data)
     mf$na.action <- substitute(na.action)
     dots <- list(...)
-    mf[[names(dots)]] <- NULL
-    mf <- eval(mf,parent.frame())
+    mf[names(dots)] <- NULL
+    mf <- eval(mf, parent.frame())
     tran.default(mf, ...)
 }

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2009-11-02 09:45:33 UTC (rev 153)
+++ pkg/inst/ChangeLog	2009-11-03 20:46:19 UTC (rev 154)
@@ -1,5 +1,11 @@
 analogue Change Log
 
+Version 0.6-22
+
+	* tran.formula: bug in my implementation of the standard
+	non-standard evaluation technique used within the formula method
+	for 'tran'. Diagnosis and fix by Prof. Brian Ripley.
+
 Version 0.6-21
 
 	* distx.c, distxy.c: Warning due to non ISO C-compliant 'mistake'