Changeset 16040 for trunk/Ohana/src/opihi/dvo/fitsed.c

Timestamp:

Jan 8, 2008, 12:50:52 PM (19 years ago)

Author:

eugene

Message:

replaced sort functions drived from press with sort macros derived from gsl

File:

• trunk/Ohana/src/opihi/dvo/fitsed.c (modified) (2 diffs)

trunk/Ohana/src/opihi/dvo/fitsed.c

@@ -436 +436 @@
 SEDtableRow **sort_SEDtable (SEDtableRow *raw, int N) {
 
-  int l,j,ir,i;
-  SEDtableRow **value, *temp;
+  int i;
+  SEDtableRow **value;
   
   if (N <= 0) return (NULL);
@@ -445 +445 @@
     value[i] = &raw[i];
   }
-  if (N < 2) return (value);
-
-  l = N >> 1;
-  ir = N - 1;
-  for (;;) {
-    if (l > 0) {
-      l--;
-      temp = value[l];
-    }
-    else {
-      temp = value[ir];
-      value[ir] = value[0];
-      if (--ir == 0) {
-        value[0] = temp;
-        return (value);
-      }
-    }
-    i = l;
-    j = (l << 1) + 1;
-    while (j <= ir) {
-      if (j < ir && value[j][0].color < value[j+1][0].color) ++j;
-      if (temp[0].color < value[j][0].color) {
-        value[i] = value[j];
-        j += (i=j) + 1;
-      }
-      else j = ir + 1;
-    }
-    value[i] = temp;
-  }
+
+# define SWAPFUNC(A,B){ SEDtableRow *temp = value[A]; value[A] = value[B]; value[B] = temp; }
+# define COMPARE(A,B)(value[A][0].color < value[B][0].color)
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
 
   return (value);