Changeset 20936 for trunk/Ohana/src/opihi/cmd.data/sort.c

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

File:

• trunk/Ohana/src/opihi/cmd.data/sort.c (modified) (3 diffs)

trunk/Ohana/src/opihi/cmd.data/sort.c

@@ -1 +1 @@
 # include "data.h"
 
+void fsortindex (opihi_flt *X, int *IDX, int N) {
+
+# define SWAPFUNC(A,B){ opihi_flt tmp; int itmp;        \
+  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
+  itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp; \
+}
+# define COMPARE(A,B)(X[A] < X[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+void isortindex (opihi_int *X, int *IDX, int N) {
+
+# define SWAPFUNC(A,B){ opihi_int tmp; int itmp;        \
+  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
+  itmp = IDX[A]; IDX[A] = IDX[B]; IDX[B] = itmp; \
+}
+# define COMPARE(A,B)(X[A] < X[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+// XXX add an option to NOT sort, but return an index instead?
 int sort_vectors (int argc, char **argv) {
   
   int i, j, Nvec, Nval;
-  float *temp, *index, *T, *V, *I;
+  opihi_flt *ftemp;
+  opihi_int *itemp;
+  int *index, *I;
   Vector **vec;
 
@@ -35 +68 @@
   }
   
-  /* create index (use float to use sortpair) */
-  ALLOCATE (index, float, Nval);
+  /* create index */
+  ALLOCATE (index, int, Nval);
   for (i = 0; i < Nval; i++) index[i] = i;
 
   /* sort key & index */
-  fsortpair (vec[0][0].elements, index, Nval);
+  if (vec[0][0].type == OPIHI_FLT) {
+    fsortindex (vec[0][0].elements.Flt, index, Nval);
+  } else {
+    isortindex (vec[0][0].elements.Int, index, Nval);
+  }
 
-  ALLOCATE (temp, float, Nval);
+  ALLOCATE (ftemp, opihi_flt, Nval);
+  ALLOCATE (itemp, opihi_int, Nval);
+
   for (i = 1; i < Nvec; i++) {
-    T = temp;
-    V = vec[i][0].elements;
-    I = index;
-    for (j = 0; j < Nval; j++, T++, I++) {
-      *T = V[(int)(*I)];
+    if (vec[i][0].type == OPIHI_FLT) {
+      opihi_flt *T = ftemp;
+      opihi_flt *V = vec[i][0].elements.Flt;
+      I = index;
+      for (j = 0; j < Nval; j++, T++, I++) {
+        *T = V[*I];
+      }
+      /* swap .elements.Flt (== V) and ftemp */ 
+      vec[i][0].elements.Flt = ftemp;
+      ftemp = V;
+    } else {
+      opihi_int *T = itemp;
+      opihi_int *V = vec[i][0].elements.Int;
+      I = index;
+      for (j = 0; j < Nval; j++, T++, I++) {
+        *T = V[*I];
+      }
+      /* swap .elements.Flt (== V) and itemp */ 
+      vec[i][0].elements.Int = itemp;
+      itemp = V;
     }
-    /* swap .elements (== V) and temp */ 
-    vec[i][0].elements = temp;
-    temp = V;
   }
-  free (temp);
+  free (itemp);
+  free (ftemp);
   free (vec);
   free (index);
@@ -61 +113 @@
 
 }
-
-