migrate estimation cli scc to application layer

neo4j · Dec 3, 2024 · baeff69 · baeff69
1 parent d66c744
commit baeff69
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 366 deletions.
diff --git a/algo/src/main/java/org/neo4j/gds/scc/Scc.java b/algo/src/main/java/org/neo4j/gds/scc/Scc.java
@@ -34,9 +34,8 @@
  * specified in:  http://code.activestate.com/recipes/578507-strongly-connected-components-of-a-directed-graph/
  */
 public class Scc extends Algorithm<HugeLongArray> {
-    public static final int UNORDERED = -1;
-    public static final String SCC_DESCRIPTION = "The SCC algorithm finds sets of connected nodes in an directed graph, " +
-                                                 "where all nodes in the same set form a connected component.";
+    private static final int UNORDERED = -1;
+
     private final Graph graph;
     private final HugeLongArrayStack boundaries;
     private final HugeLongArray connectedComponents;

diff --git a/algo/src/main/java/org/neo4j/gds/scc/SccAlgorithmFactory.java b/algo/src/main/java/org/neo4j/gds/scc/SccAlgorithmFactory.java
diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/scc/AlphaSccWriteSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/scc/AlphaSccWriteSpec.java
diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccMutateSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccMutateSpec.java
diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccStatsSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccStatsSpec.java
diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccStreamSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccStreamSpec.java
diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccWriteSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/scc/SccWriteSpec.java
diff --git a/...ty/src/main/java/org/neo4j/gds/applications/algorithms/community/CommunityAlgorithms.java b/...ty/src/main/java/org/neo4j/gds/applications/algorithms/community/CommunityAlgorithms.java
@@ -38,6 +38,7 @@
 import org.neo4j.gds.config.ConcurrencyConfig;
 import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.paged.dss.DisjointSetStruct;
+import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 import org.neo4j.gds.core.utils.progress.tasks.Tasks;
 import org.neo4j.gds.k1coloring.K1ColoringBaseConfig;
@@ -400,6 +401,10 @@ HugeLongArray scc(Graph graph, AlgoBaseConfig configuration) {
             Tasks.leaf(AlgorithmLabel.SCC.asString(), graph.nodeCount())
         );
 
+        return scc(graph, configuration, progressTracker);
+    }
+
+    public HugeLongArray scc(Graph graph, ConcurrencyConfig configuration, ProgressTracker progressTracker) {
         var algorithm = new Scc(graph, progressTracker, terminationFlag);
 
         return algorithmMachinery.runAlgorithmsAndManageProgressTracker(