Be picky with double comparisons

Co-Authored-By: Ioannis Panagiotas <[email protected]>
neo4j · Oct 24, 2023 · c6a49ce · c6a49ce
1 parent b3cbeff
commit c6a49ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/algo/src/main/java/org/neo4j/gds/dag/longestPath/DagLongestPath.java b/algo/src/main/java/org/neo4j/gds/dag/longestPath/DagLongestPath.java
@@ -74,7 +74,7 @@ protected DagLongestPath(
         this.nodeCount = graph.nodeCount();
         this.concurrency = concurrency;
         this.inDegrees = HugeAtomicLongArray.of(nodeCount, ParalleLongPageCreator.passThrough(this.concurrency));
-        this.parentsAndDistances = TentativeDistances.distanceAndPredecessors(nodeCount, concurrency, Double.MIN_VALUE, (a, b) -> a < b);
+        this.parentsAndDistances = TentativeDistances.distanceAndPredecessors(nodeCount, concurrency, Double.MIN_VALUE, (a, b) -> Double.compare(a, b) < 0);
     }
 
     @Override
@@ -191,9 +191,9 @@ void longestPathTraverse(long source, long target, double weight) {
             // the source distance will never change anymore, but the target distance might
             var potentialDistance = parentsAndDistances.distance(source) + weight;
             var currentTargetDistance = parentsAndDistances.distance(target);
-            while(potentialDistance > currentTargetDistance) {
+            while (Double.compare(potentialDistance, currentTargetDistance) > 0) {
                 var witnessValue = parentsAndDistances.compareAndExchange(target, currentTargetDistance, potentialDistance, source);
-                if(currentTargetDistance == witnessValue) {
+                if (Double.compare(currentTargetDistance, witnessValue) == 0) {
                     break;
                 }
                 currentTargetDistance = parentsAndDistances.distance(target);

diff --git a/algo/src/main/java/org/neo4j/gds/paths/delta/TentativeDistances.java b/algo/src/main/java/org/neo4j/gds/paths/delta/TentativeDistances.java
@@ -76,7 +76,7 @@ static DistanceAndPredecessor distanceAndPredecessors(
         long size,
         int concurrency
     ) {
-        return distanceAndPredecessors(size, concurrency, DIST_INF, (a, b) -> a > b);
+        return distanceAndPredecessors(size, concurrency, DIST_INF, (a, b) -> Double.compare(a, b) > 0);
     }
 
     public static DistanceAndPredecessor distanceAndPredecessors(
@@ -183,7 +183,7 @@ public double compareAndExchange(long nodeId, double expectedDistance, double ne
                 //we  should signal failure
                 // for that we must be sure not to return the 'expectedDistance' by accident!
                 //we hence return its negation (or -1 if ==0)
-                return (Double.compare(expectedDistance, 0.0) == 0) ? -1.0 : -expectedDistance;
+                return Double.compare(expectedDistance, 0.0) == 0 ? -1.0 : -expectedDistance;
             }
 
             var witness = predecessors.compareAndExchange(nodeId, currentPredecessor, -predecessor - 1);
@@ -192,7 +192,7 @@ public double compareAndExchange(long nodeId, double expectedDistance, double ne
             if (witness != currentPredecessor) {
                 //we  should signal failure
                 // for that we must be sure not to return the 'expectedDistance' by accident!
-                return (Double.compare(expectedDistance, 0.0) == 0) ? -1.0 : -expectedDistance;
+                return Double.compare(expectedDistance, 0.0) == 0 ? -1.0 : -expectedDistance;
             }
 
             // we have the lock; no-one else can write on nodeId at the moment.