simplify 3d

Author: MLopez-Ibanez

c/nondominated.h

@@ -363,7 +363,7 @@ find_nondominated_3d_impl_sorted(const double ** rows, size_t size,
 
     // In this context, size means "no dominated solution found".
     size_t new_size = size, j = 1, k = 0;
-    const double * last_dom = NULL;
+    size_t last_dom_pos = size;
     const double * restrict pk = rows[0];
     do {
         bool dominated;
@@ -414,24 +414,24 @@ find_nondominated_3d_impl_sorted(const double ** rows, size_t size,
             // Handle duplicates and points that are dominated by the immediate
             // previous one.
             const bool k_eq_j = (pk[0] == pj[0]) & (pk[1] == pj[1]) & (pk[2] == pj[2]);
-            if (!keep_weakly) { // We don't keep duplicates;
-                if (unlikely(k_eq_j) && pj < pk) { // Only the first duplicated point is kept.
+            if (!keep_weakly) { // Don't keep duplicates;
+                if (pj < pk && unlikely(k_eq_j)) { // Only the first duplicated point is kept.
                     if (find_one_dominated) {
                         // In this context, it means "position of the first dominated solution found".
                         new_size = k;
                         goto early_end;
                     }
-                    last_dom = pk;
+                    last_dom_pos = k;
                     rows[k] = NULL;
                     new_size--;
                     dominated = false; // Do not delete pj.
                 } else {
                     dominated = true;
                 }
-            } else { // or it is not a duplicate, so it is non-weakly dominated;
-                dominated = likely(!k_eq_j)
-                    // or pk was dominated, then this one is also dominated.
-                    || last_dom == pk;
+            } else { // or pk was dominated, then this one is also dominated;
+                dominated = (last_dom_pos == k)
+                    // or it is not a duplicate, so it is non-weakly dominated.
+                    || likely(!k_eq_j);
             }
             DEBUG2(printf_point("weakly dominated by pk: ", pk, 3, "\n"));
         }
@@ -441,7 +441,7 @@ find_nondominated_3d_impl_sorted(const double ** rows, size_t size,
                 new_size = j;
                 goto early_end;
             }
-            last_dom = pj;
+            last_dom_pos = j;
             rows[j] = NULL;
             new_size--;
         } else {