Fixes

Co-authored-by: Ioannis Panagiotas <ioannis.panagiotas@neo4j.com>

Author: AlfredClemedtson

algo/src/main/java/org/neo4j/gds/maxflow/DischargeTask.java

@@ -49,8 +49,6 @@ public class DischargeTask implements Runnable {
     private PHASE phase;
     private long localWork;
 
-
-
     public DischargeTask(
         FlowGraph flowGraph,
         HugeDoubleArray excess,

algo/src/main/java/org/neo4j/gds/maxflow/Discharging.java

@@ -52,8 +52,8 @@ static Discharging createDischarging(
     )
     {
 
-        var tempLabel = HugeLongArray.newArray(flowGraph.originalNodeCount());
-        var isDiscovered = HugeAtomicBitSet.create(flowGraph.originalNodeCount());
+        var tempLabel = HugeLongArray.newArray(flowGraph.nodeCount());
+        var isDiscovered = HugeAtomicBitSet.create(flowGraph.nodeCount());
 
         List<Runnable> dischargeTasks = new ArrayList<>();
         for (int i = 0; i < concurrency.value(); i++) {

algo/src/main/java/org/neo4j/gds/maxflow/FlowGraph.java

@@ -159,7 +159,6 @@ public FlowGraph concurrentCopy() {
     }
 
     private void forEachOriginalRelationship(long nodeId, ResidualEdgeConsumer consumer) {
-        //todo: Rename original, since it also includes 'non-reverse' edges from superNodes
         var relIdx = new MutableLong(indPtr.get(nodeId));
         RelationshipWithPropertyConsumer originalConsumer = (s, t, capacity) -> {
             var residualCapacity = capacity - flow.get(relIdx.longValue());

algo/src/main/java/org/neo4j/gds/maxflow/GlobalRelabeling.java

@@ -29,8 +29,6 @@
 import java.util.Collection;
 import java.util.List;
 
-
-
 public final class GlobalRelabeling {
     private final long nodeCount;
     private final HugeLongArray label;
@@ -88,4 +86,3 @@ public void globalRelabeling() {
 
     }
 }
-

algo/src/main/java/org/neo4j/gds/maxflow/MaxFlow.java

@@ -24,7 +24,6 @@
 import org.neo4j.gds.collections.ha.HugeDoubleArray;
 import org.neo4j.gds.collections.ha.HugeLongArray;
 import org.neo4j.gds.collections.haa.HugeAtomicDoubleArray;
-import org.neo4j.gds.core.utils.paged.HugeAtomicBitSet;
 import org.neo4j.gds.core.utils.paged.HugeLongArrayQueue;
 import org.neo4j.gds.core.utils.paged.ParallelDoublePageCreator;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
@@ -87,9 +86,7 @@ private void maximizeFlow(Preflow preflow, long sourceNode, long targetNode) { /
         var addedExcess = HugeAtomicDoubleArray.of(
             nodeCount,
             ParallelDoublePageCreator.passThrough(parameters.concurrency())
-        ); //fixme
-        var tempLabel = HugeLongArray.newArray(nodeCount);
-        var isDiscovered = HugeAtomicBitSet.create(nodeCount);
+        );
         var workingSet = new AtomicWorkingSet(nodeCount);
         for (var nodeId = 0; nodeId < nodeCount; nodeId++) {
             if (excess.get(nodeId) > 0.0) {

algo/src/main/java/org/neo4j/gds/maxflow/SupplyAndDemandFactory.java

@@ -55,7 +55,7 @@ private static NodeWithValue[] createSupply(InputNodes sourceNodes, Graph graph)
                     graph.toMappedNodeId(entry.getKey()),
                     entry.getValue()
                 )).toArray(NodeWithValue[]::new);
-                default -> throw new IllegalStateException("Unexpected value: " + sourceNodes); //fixme
+                default -> throw new IllegalStateException("Unexpected value: " + sourceNodes);
             };
     }
 
@@ -70,7 +70,7 @@ private static NodeWithValue[] createDemand(InputNodes targetNodes, Graph graph,
                     graph.toMappedNodeId(entry.getKey()),
                     entry.getValue()
                 )).toArray(NodeWithValue[]::new);
-                default -> throw new IllegalStateException("Unexpected value: " + targetNodes); //fixme
+                default -> throw new IllegalStateException("Unexpected value: " + targetNodes);
             };
     }
 }

algo/src/test/java/org/neo4j/gds/maxflow/MaxFlowTest.java

@@ -82,7 +82,7 @@ Graph generateUniform(long nodeCount, int avgDegree) {
 
     void testGraph(Graph graph, InputNodes sourceNodes, InputNodes targetNodes, double expectedFlow, int concurrency) {
         var params = new MaxFlowParameters(sourceNodes, targetNodes, new Concurrency(concurrency), ALPHA, BETA, FREQ);
-        var x = new MaxFlow(graph, params, null, null); //fixme
+        var x = new MaxFlow(graph, params, null, null);
         var result = x.compute();
         assertThat(result.totalFlow()).isCloseTo(expectedFlow, Offset.offset(TOLERANCE));
     }