[Analogue-commits] r370 - pkg/src

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

Author: gsimpson
Date: 2013-10-06 22:40:32 +0200 (Sun, 06 Oct 2013)
New Revision: 370

Modified:
   pkg/src/distx.c
Log:
a little tidying

Modified: pkg/src/distx.c
===================================================================
--- pkg/src/distx.c	2013-10-06 20:32:05 UTC (rev 369)
+++ pkg/src/distx.c	2013-10-06 20:40:32 UTC (rev 370)
@@ -505,13 +505,13 @@
   
   for (j=0; j<nc; j++) {
     if (R_FINITE(x[i1]) && R_FINITE(x[i2])) {
+      // Symmetric binary
       if(vtype[j] == 1) {
 	dev = (x[i1] == x[i2]) ? 1 : 0;
 	dist += dev * weights[j];
       }
-      if(vtype[j] == 2) { // Asymmetric binary
-	/*dev = (x[i1] == x[i2]) ? 1 : 0;
-	  dist += dev * weights[j]; */
+      // Asymmetric binary
+      if(vtype[j] == 2) {
 	if((x[i1] != 0) || (x[i2] != 0)) {
 	  // both x1 and x2 not zero for this variables
 	  dev = (x[i1] == x[i2]) ? 1 : 0;
@@ -525,16 +525,19 @@
 	  wsum -= weights[j];
 	}
       }
-      if(vtype[j] == 3) { // Nominal
+      // Nominal
+      if(vtype[j] == 3) {
 	dev = (x[i1] == x[i2]) ? 1 : 0;
 	dist += dev * weights[j];
       }
-      if(vtype[j] == 4) { // Ordinal
+      // Ordinal
+      if(vtype[j] == 4) {
 	/* ordinal data currently handled as Nominal */
 	dev = (x[i1] == x[i2]) ? 1 : 0;
 	dist += dev * weights[j];
 	break;
       }
+      // Quantitative
       if(vtype[j] == 5) {
 	dev = 1 - (fabs(x[i1] - x[i2]) / R[j]);
 	dist += dev * weights[j];