[Vegan-commits] r1702 - in branches/1.17: R inst

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

Author: jarioksa
Date: 2011-08-09 11:00:27 +0200 (Tue, 09 Aug 2011)
New Revision: 1702

Modified:
   branches/1.17/R/ade2vegancca.R
   branches/1.17/R/model.frame.cca.R
   branches/1.17/R/model.matrix.cca.R
   branches/1.17/inst/ChangeLog
Log:
merge 1699, 1700 (partial)

Modified: branches/1.17/R/ade2vegancca.R
===================================================================
--- branches/1.17/R/ade2vegancca.R	2011-08-09 08:14:38 UTC (rev 1701)
+++ branches/1.17/R/ade2vegancca.R	2011-08-09 09:00:27 UTC (rev 1702)
@@ -25,7 +25,7 @@
                 CCA = CCA,
                 CA = NULL,
                 method = "cca",
-                inertia = "mean square contigency coefficient")
+                inertia = "mean squared contingency coefficient")
     class(out) = c("ade4cca", "cca")
     out
 }

Modified: branches/1.17/R/model.frame.cca.R
===================================================================
--- branches/1.17/R/model.frame.cca.R	2011-08-09 08:14:38 UTC (rev 1701)
+++ branches/1.17/R/model.frame.cca.R	2011-08-09 09:00:27 UTC (rev 1702)
@@ -8,7 +8,7 @@
         0)
     call <- call[c(1, m)]
     call[[1]] <- as.name("ordiParseFormula")
-    out <- eval(call, parent.frame())
+    out <- eval(call, environment(), parent.frame())
     mf <- out$modelframe
     attr(mf, "terms") <- out$terms.expand
     if (!is.null(out$na.action)) 

Modified: branches/1.17/R/model.matrix.cca.R
===================================================================
--- branches/1.17/R/model.matrix.cca.R	2011-08-09 08:14:38 UTC (rev 1701)
+++ branches/1.17/R/model.matrix.cca.R	2011-08-09 09:00:27 UTC (rev 1702)
@@ -8,7 +8,7 @@
         0)
     call <- call[c(1, m)]
     call[[1]] <- as.name("ordiParseFormula")
-    out <- eval(call, parent.frame())[c("Z", "Y")]
+    out <- eval(call, environment(), parent.frame())[c("Z", "Y")]
     m <- list()
     if (!is.null(out$Z))
         m$Conditions <- out$Z

Modified: branches/1.17/inst/ChangeLog
===================================================================
--- branches/1.17/inst/ChangeLog	2011-08-09 08:14:38 UTC (rev 1701)
+++ branches/1.17/inst/ChangeLog	2011-08-09 09:00:27 UTC (rev 1702)
@@ -7,7 +7,9 @@
 	* Most minor changes and fixes since the release of 1.17-11 (rev
 	1634). Basically everything except 'permute' dependence and
 	monoMDS. Also adds the minimal NAMESPACE file of 1695 (without S3
-	method registration).
+	method registration and later revs).
+	* partially merged 1700: model.{frame,matrix}.cca scoping.
+	* merged 1699: ade2vegancca typo.
 	* partially merged r1696: superfluous aliases in deviance.cca.Rd
 	and predict.cca.Rd, scoping in anova.ccabyterm.R.
 	* merged 1695: minimal NAMESPACE and zzz.R.