Changeset 38986 for trunk/Ohana/src/libohana/src/sorts.c

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libohana/src/sorts.c (modified) (7 diffs)

trunk/Ohana/src/libohana/src/sorts.c

@@ -27 +27 @@
 }
 
-void fsortpair (float *X, float *Y, int N) {
+void isort (int *value, int N) {
 
-# define SWAPFUNC(A,B){ float tmp; \
+# define SWAPFUNC(A,B){ int tmp = value[A]; value[A] = value[B]; value[B] = tmp; }
+# define COMPARE(A,B)(value[A] < value[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+void dsortpair (double *X, double *Y, int N) {
+
+# define SWAPFUNC(A,B){ double tmp; \
   tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
   tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
@@ -42 +54 @@
 }
 
-void dsortpair (double *X, double *Y, int N) {
+void fsortpair (float *X, float *Y, int N) {
 
-# define SWAPFUNC(A,B){ double tmp; \
+# define SWAPFUNC(A,B){ float tmp; \
   tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
   tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
@@ -89 +101 @@
 }
 
+void dsortthree (double *X, double *Y, double *Z, int N) {
+
+# define SWAPFUNC(A,B){ double tmp; \
+  tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
+  tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
+  tmp = Z[A]; Z[A] = Z[B]; Z[B] = tmp; \
+}
+# define COMPARE(A,B)(X[A] < X[B])
+
+  OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
 void fsortthree (float *X, float *Y, float *Z, int N) {
 
@@ -105 +133 @@
 }
 
-void dsortthree (double *X, double *Y, double *Z, int N) {
+void dsortfour (double *X, double *Y, double *Z, double *W, int N) {
 
 # define SWAPFUNC(A,B){ double tmp; \
@@ -111 +139 @@
   tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
   tmp = Z[A]; Z[A] = Z[B]; Z[B] = tmp; \
+  tmp = W[A]; W[A] = W[B]; W[B] = tmp; \
 }
 # define COMPARE(A,B)(X[A] < X[B])
@@ -138 +167 @@
 }
 
-void dsortfour (double *X, double *Y, double *Z, double *W, int N) {
+void isortfour (int *X, int *Y, int *Z, int *W, int N) {
 
-# define SWAPFUNC(A,B){ double tmp; \
+# define SWAPFUNC(A,B){ int tmp; \
   tmp = X[A]; X[A] = X[B]; X[B] = tmp; \
   tmp = Y[A]; Y[A] = Y[B]; Y[B] = tmp; \
@@ -154 +183 @@
 
 }
+