Changeset 16040 for trunk/Ohana/src/libdvo

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

Location:

trunk/Ohana/src/libdvo

Files:

• Makefile (modified) (1 diff)
• include/dvo.h (modified) (1 diff)
• src/dvosorts.c (added)
• src/skyregion_gsc.c (modified) (1 diff)

trunk/Ohana/src/libdvo/Makefile

@@ -36 +36 @@
 $(SRC)/version.$(ARCH).o         \
 $(SRC)/coordops.$(ARCH).o        \
+$(SRC)/dvosorts.$(ARCH).o        \
 $(SRC)/dvo_photcode_ops.$(ARCH).o \
 $(SRC)/dvo_photcode_convert_elixir.$(ARCH).o \

trunk/Ohana/src/libdvo/include/dvo.h

@@ -412 +412 @@
 int        SkyTableSetFilenames    PROTO((SkyTable *sky, char *path, char *ext));
 
+/* dvo-specific sorting functions */
+void sortave (Average *ave, int N);
+void sort_image_subset (Image *image, int *subset, int N);
+void sort_coords_index (double *X, double *Y, int *S, int N);
+void sort_stars_ra (Stars *stars, int N);
+void sort_regions (SkyRegion *region, int N);
+
 # endif

trunk/Ohana/src/libdvo/src/skyregion_gsc.c

@@ -206 +206 @@
 void SkyTableSort (SkyTable *table) {
 
-  int i, j, l, ir, N;
   SkyRegion *regions;
-  SkyRegion tempregion;
-  char *tempfile = NULL;
   char **filename = NULL;
-  
-  N = table[0].Nregions;
+
   regions = table[0].regions;
   filename = table[0].filename;
 
-  if (N < 2) return;
-  l = N >> 1;
-  ir = N - 1;
-  for (;;) {
-    if (l > 0) {
-      l--;
-      tempregion = regions[l];
-      if (filename) tempfile   = filename[l];
-    } else {
-      tempregion   = regions[ir];
-      if (filename) tempfile     = filename[ir];
-      regions[ir]   = regions[0];
-      if (filename) filename[ir] = filename[0];
-      if (--ir == 0) {
-        regions[0]   = tempregion;
-        if (filename) filename[0] = tempfile;
-        return;
-      }
-    }
-    i = l;
-    j = (l << 1) + 1;
-    while (j <= ir) {
-      if (j < ir && regions[j].Rmin < regions[j+1].Rmin) ++j;
-      if (tempregion.Rmin < regions[j].Rmin) {
-        regions[i]   = regions[j];
-        if (filename) filename[i] = filename[j];
-        j += (i=j) + 1;
-      } 
-      else j = ir + 1;
-    }
-    regions[i]   = tempregion;
-    if (filename) filename[i] = tempfile;
-  }
+# define SWAPFUNC(A,B){ int tmp; \
+  char     *tempfile = filename[A]; filename[A] = filename[B]; filename[B] = tempfile; \
+  SkyRegion tempregion = regions[A]; regions[A] = regions[B]; regions[B] = tempregion; \
+}
+# define COMPARE(A,B)(regions[A].Rmin < regions[B].Rmin)
+
+  OHANA_SORT (table[0].Nregions, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
 }