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

Timestamp:

Mar 18, 2019, 5:02:59 PM (7 years ago)

Author:

eugene

Message:

cleanup opihi sort functions; add deimos fitobj function

File:

• trunk/Ohana/src/opihi/cmd.data/sort.c (modified) (2 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])
-# define COMPARE(A,B)((!isfinite(X[A]) && isfinite(X[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])
-// # define COMPARE(A,B)((!isfinite(X[A]) && isfinite(X[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?
@@ -78 +44 @@
   /* sort key & index */
   if (vec[0][0].type == OPIHI_FLT) {
-    fsortindex (vec[0][0].elements.Flt, index, Nval);
+    sort_opihi_flt_index (vec[0][0].elements.Flt, index, Nval);
   } else {
-    isortindex (vec[0][0].elements.Int, index, Nval);
+    sort_int_index (vec[0][0].elements.Int, index, Nval);
   }