[Vegan-commits] r2105 - in pkg/vegan: . inst src

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

Author: jarioksa
Date: 2012-02-23 16:13:34 +0100 (Thu, 23 Feb 2012)
New Revision: 2105

Modified:
   pkg/vegan/DESCRIPTION
   pkg/vegan/inst/ChangeLog
   pkg/vegan/src/vegdist.c
Log:
Merge branch 'up' into r-forge-svn-local

Modified: pkg/vegan/DESCRIPTION
===================================================================
--- pkg/vegan/DESCRIPTION	2012-02-23 14:37:51 UTC (rev 2104)
+++ pkg/vegan/DESCRIPTION	2012-02-23 15:13:34 UTC (rev 2105)
@@ -1,7 +1,7 @@
 Package: vegan
 Title: Community Ecology Package
-Version: 2.1-12
-Date: February 9, 2012
+Version: 2.1-13
+Date: February 23, 2012
 Author: Jari Oksanen, F. Guillaume Blanchet, Roeland Kindt, Pierre Legendre, 
    Peter R. Minchin, R. B. O'Hara, Gavin L. Simpson, Peter Solymos, 
    M. Henry H. Stevens, Helene Wagner  

Modified: pkg/vegan/inst/ChangeLog
===================================================================
--- pkg/vegan/inst/ChangeLog	2012-02-23 14:37:51 UTC (rev 2104)
+++ pkg/vegan/inst/ChangeLog	2012-02-23 15:13:34 UTC (rev 2105)
@@ -2,8 +2,12 @@
 
 VEGAN DEVEL VERSIONS at http://r-forge.r-project.org/
 
-Version 2.1-12 (opened February 9, 2012)
+Version 2.1-13 (opened February 23, 2012)
 
+	* vegdist: Added Cao dissimilarity (CYd).
+	
+Version 2.1-12 (closed February 23, 2012)
+
 	* scores.default: failed if users asked scores of non-existing
 	axes. This was reported as an error in ordiplot() when the user
 	tried to plot 2-dim graph of 1-dim solution in

Modified: pkg/vegan/src/vegdist.c
===================================================================
--- pkg/vegan/src/vegdist.c	2012-02-23 14:37:51 UTC (rev 2104)
+++ pkg/vegan/src/vegdist.c	2012-02-23 15:13:34 UTC (rev 2105)
@@ -534,7 +534,7 @@
 
 double veg_cao(double *x, int nr, int nc, int i1, int i2)
 {
-     double dist, x1, x2, t1, t2, t3, tlog;
+     double dist, x1, x2, t1, t2;
      int count, j;
   
      count = 0;