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

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

Author: gsimpson
Date: 2009-06-08 21:23:50 +0200 (Mon, 08 Jun 2009)
New Revision: 134

Modified:
   pkg/DESCRIPTION
   pkg/R/tran.R
   pkg/inst/ChangeLog
Log:
'tran' now uses data.matrix to convert input data to matrix.

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2009-06-07 13:34:37 UTC (rev 133)
+++ pkg/DESCRIPTION	2009-06-08 19:23:50 UTC (rev 134)
@@ -1,7 +1,7 @@
 Package: analogue
 Type: Package
 Title: Analogue and weighted averaging methods for palaeoecology
-Version: 0.6-10
+Version: 0.6-11
 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-06-07 13:34:37 UTC (rev 133)
+++ pkg/R/tran.R	2009-06-08 19:23:50 UTC (rev 134)
@@ -2,7 +2,7 @@
                    na.rm = FALSE, na.value = 0, ...) {
     wasDF <- is.data.frame(x)
     dim.nams <- dimnames(x)
-    x <- as.matrix(x)
+    x <- data.matrix(x)
     METHOD <- c("sqrt", "cubert", "log", "reciprocal", "freq", "center",
                 "standardize", "range", "percent", "proportion", "pa",
                 "missing", "hellinger", "chi.square", "wisconsin",

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2009-06-07 13:34:37 UTC (rev 133)
+++ pkg/inst/ChangeLog	2009-06-08 19:23:50 UTC (rev 134)
@@ -1,5 +1,10 @@
 analogue Change Log
 
+Version 0.6-11
+
+	* tran: now converts input data to matrix using 'data.matrix' which
+	deals with factor variables appropriately.
+	
 Version 0.6-10
 
 	* predict.wa: Predictions with tolerance DW now works for CV = "LOO"