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

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

Author: jarioksa
Date: 2009-07-12 16:01:23 +0200 (Sun, 12 Jul 2009)
New Revision: 890

Modified:
   pkg/vegan/R/ordiGetData.R
   pkg/vegan/inst/ChangeLog
Log:
capscale works either with 'dfun' or with 'metaMDSdist' (but not with both)

Modified: pkg/vegan/R/ordiGetData.R
===================================================================
--- pkg/vegan/R/ordiGetData.R	2009-07-09 14:58:43 UTC (rev 889)
+++ pkg/vegan/R/ordiGetData.R	2009-07-12 14:01:23 UTC (rev 890)
@@ -2,7 +2,7 @@
 function (call, env) 
 {
     call$scale <- call$distance <- call$comm <- call$add <-
-        call$sqrt.dist <- NULL
+        call$dfun <- call$sqrt.dist <- call$metaMDSdist <- NULL
     call$na.action <- na.pass
     call[[2]] <- NULL
     call[[1]] <- as.name("model.frame")

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2009-07-09 14:58:43 UTC (rev 889)
+++ pkg/vegan/inst/ChangeLog	2009-07-12 14:01:23 UTC (rev 890)
@@ -13,6 +13,9 @@
 	not additive, and the "Imaginary" component is not used in
 	estimating the unconstrained component.
 
+	* capscale: really works now either with argument 'dfun' or
+	'metaMDSdist' (but not with both!).
+
 	* wcmdscale: returns negative eigevalues scaled by
 	sqrt(abs(eigenvalues)) if 'k' is not given or 'k' would include
 	any negative eigenvalue.