Changeset 40397 for trunk

Timestamp:

Apr 14, 2018, 2:25:36 PM (8 years ago)

Author:

eugene

Message:

fix dvo sorts to put NAN values at bottom

File:

• trunk/Ohana/src/libdvo/src/dvosorts.c (modified) (4 diffs)

trunk/Ohana/src/libdvo/src/dvosorts.c

@@ -7 +7 @@
 
 # define SWAPFUNC(A,B){ Average tmp; tmp = ave[A]; ave[A] = ave[B]; ave[B] = tmp; }
-# define COMPARE(A,B)(ave[A].R < ave[B].R)
+# define COMPARE(A,B)((!isfinite(ave[A].R) && isfinite(ave[B].R)) || (ave[A].R < ave[B].R))
+// # define COMPARE(A,B)                                             (ave[A].R < ave[B].R)
 
   OHANA_SORT (N, COMPARE, SWAPFUNC);
@@ -50 +51 @@
   itmp = S[A]; S[A] = S[B]; S[B] = itmp; \
 }
-# define COMPARE(A,B)(X[A] < X[B])
+// # 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);
@@ -81 +83 @@
   itmp = S[A]; S[A] = S[B]; S[B] = itmp; \
 }
-# define COMPARE(A,B)(X[S[A]] < X[S[B]])
+# define COMPARE(A,B)((!isfinite(X[S[A]]) && isfinite(X[S[B]])) || (X[S[A]] < X[S[B]]))
 
   OHANA_SORT (N, COMPARE, SWAPFUNC);
@@ -93 +95 @@
 
 # define SWAPFUNC(A,B){ SkyRegion tmp; tmp = region[A]; region[A] = region[B]; region[B] = tmp; }
-# define COMPARE(A,B)(region[A].Dmin < region[B].Dmin)
+// # define COMPARE(A,B)(region[A].Dmin < region[B].Dmin)
+# define COMPARE(A,B)((!isfinite(region[A].Dmin) && isfinite(region[B].Dmin)) || (region[A].Dmin < region[B].Dmin))
 
   OHANA_SORT (N, COMPARE, SWAPFUNC);