[Analogue-commits] r153 - in pkg: . inst src

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

Author: gsimpson
Date: 2009-11-02 10:45:33 +0100 (Mon, 02 Nov 2009)
New Revision: 153

Modified:
   pkg/DESCRIPTION
   pkg/inst/ChangeLog
   pkg/src/distx.c
   pkg/src/distxy.c
Log:
Silly typo in C code distx and distxy made them non ISO C-compliant.

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

Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2009-10-14 20:45:33 UTC (rev 152)
+++ pkg/inst/ChangeLog	2009-11-02 09:45:33 UTC (rev 153)
@@ -1,5 +1,10 @@
 analogue Change Log
 
+Version 0.6-21
+
+	* distx.c, distxy.c: Warning due to non ISO C-compliant 'mistake'
+	in experimental code for Gower's Mixed coefficient.
+
 Version 0.6-20
 
 	* Stratiplot: was not respecting the sort variable under certain

Modified: pkg/src/distx.c
===================================================================
--- pkg/src/distx.c	2009-10-14 20:45:33 UTC (rev 152)
+++ pkg/src/distx.c	2009-11-02 09:45:33 UTC (rev 153)
@@ -499,7 +499,7 @@
 		dist += dev * weights[j];
 	    }
 	    if(vtype[j] == 2) {
-		dev = (x[i1] == x[i2]) ?   : 0;
+		dev = (x[i1] == x[i2]) ? 1 : 0;
 		dist += dev * weights[j];
 	    }
 	    if(vtype[j] == 3) {

Modified: pkg/src/distxy.c
===================================================================
--- pkg/src/distxy.c	2009-10-14 20:45:33 UTC (rev 152)
+++ pkg/src/distxy.c	2009-11-02 09:45:33 UTC (rev 153)
@@ -491,7 +491,7 @@
 		dist += dev * weights[j];
 	    }
 	    if(vtype[j] == 2) {
-		dev = (x[i1] == y[i2]) ?   : 0;
+		dev = (x[i1] == y[i2]) ? 1 : 0;
 		dist += dev * weights[j];
 	    }
 	    if(vtype[j] == 3) {