From Centrality to Community :oops:

neo4j · Nov 7, 2024 · c760731 · c760731
1 parent 60c54bf
commit c760731
Show file tree

Hide file tree

Showing 44 changed files with 298 additions and 282 deletions.
diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAMutateSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAMutateSpec.java
@@ -30,7 +30,7 @@
 import org.neo4j.gds.executor.ExecutionMode;
 import org.neo4j.gds.executor.GdsCallable;
 import org.neo4j.gds.mem.MemoryEstimation;
-import org.neo4j.gds.procedures.algorithms.centrality.SpeakerListenerLPAMutateResult;
+import org.neo4j.gds.procedures.algorithms.community.SpeakerListenerLPAMutateResult;
 import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.sllpa.SpeakerListenerLPA;
 import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;

diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAStatsSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAStatsSpec.java
@@ -30,7 +30,7 @@
 import org.neo4j.gds.executor.ExecutionMode;
 import org.neo4j.gds.executor.GdsCallable;
 import org.neo4j.gds.mem.MemoryEstimation;
-import org.neo4j.gds.procedures.algorithms.centrality.SpeakerListenerLPAStatsResult;
+import org.neo4j.gds.procedures.algorithms.community.SpeakerListenerLPAStatsResult;
 import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.sllpa.SpeakerListenerLPA;
 import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;

diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAStreamSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAStreamSpec.java
@@ -30,7 +30,7 @@
 import org.neo4j.gds.executor.ExecutionMode;
 import org.neo4j.gds.executor.GdsCallable;
 import org.neo4j.gds.mem.MemoryEstimation;
-import org.neo4j.gds.procedures.algorithms.centrality.SpeakerListenerLPAStreamResult;
+import org.neo4j.gds.procedures.algorithms.community.SpeakerListenerLPAStreamResult;
 import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.sllpa.SpeakerListenerLPA;
 import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;

diff --git a/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAWriteSpec.java b/algorithm-specifications/src/main/java/org/neo4j/gds/sllp/SpeakerListenerLPAWriteSpec.java
@@ -30,7 +30,7 @@
 import org.neo4j.gds.executor.ExecutionMode;
 import org.neo4j.gds.executor.GdsCallable;
 import org.neo4j.gds.mem.MemoryEstimation;
-import org.neo4j.gds.procedures.algorithms.centrality.SpeakerListenerLPAWriteResult;
+import org.neo4j.gds.procedures.algorithms.community.SpeakerListenerLPAWriteResult;
 import org.neo4j.gds.procedures.algorithms.configuration.NewConfigFunction;
 import org.neo4j.gds.sllpa.SpeakerListenerLPA;
 import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;

diff --git a/.../src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityAlgorithms.java b/.../src/main/java/org/neo4j/gds/applications/algorithms/centrality/CentralityAlgorithms.java
@@ -28,7 +28,6 @@
 import org.neo4j.gds.articulationpoints.ArticulationPoints;
 import org.neo4j.gds.articulationpoints.ArticulationPointsProgressTaskCreator;
 import org.neo4j.gds.beta.pregel.Pregel;
-import org.neo4j.gds.beta.pregel.PregelResult;
 import org.neo4j.gds.betweenness.BetweennessCentrality;
 import org.neo4j.gds.betweenness.BetweennessCentralityBaseConfig;
 import org.neo4j.gds.betweenness.BetwennessCentralityResult;
@@ -68,13 +67,8 @@
 import org.neo4j.gds.pagerank.PageRankComputation;
 import org.neo4j.gds.pagerank.PageRankConfig;
 import org.neo4j.gds.pagerank.PageRankResult;
-import org.neo4j.gds.sllpa.SpeakerListenerLPA;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAProgressTrackerCreator;
 import org.neo4j.gds.termination.TerminationFlag;
 
-import java.util.Optional;
-
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticleRank;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.EigenVector;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.PageRank;
@@ -344,18 +338,5 @@ private PageRankComputation pageRankComputation(Graph graph, PageRankConfig conf
         return new PageRankComputation(configuration, mappedSourceNodes, degreeFunction);
     }
 
-    PregelResult speakerListenerLPA(Graph graph, SpeakerListenerLPAConfig configuration){
-        var task  =SpeakerListenerLPAProgressTrackerCreator.progressTask(graph.nodeCount(),configuration.maxIterations(),AlgorithmLabel.SLLPA.asString());
-        var progressTracker = progressTrackerCreator.createProgressTracker(configuration, task);
-
-        var algorithm = new SpeakerListenerLPA(
-            graph,
-            configuration,
-            DefaultPool.INSTANCE,
-            progressTracker,
-            Optional.empty()
-        );
 
-        return algorithmMachinery.runAlgorithmsAndManageProgressTracker(algorithm, progressTracker, true);
-    }
 }
diff --git a/.../applications/algorithms/centrality/CentralityAlgorithmsEstimationModeBusinessFacade.java b/.../applications/algorithms/centrality/CentralityAlgorithmsEstimationModeBusinessFacade.java
@@ -38,8 +38,6 @@
 import org.neo4j.gds.mem.MemoryEstimation;
 import org.neo4j.gds.pagerank.PageRankMemoryEstimateDefinition;
 import org.neo4j.gds.pagerank.RankConfig;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAMemoryEstimateDefinition;
 
 public class CentralityAlgorithmsEstimationModeBusinessFacade {
     private final AlgorithmEstimationTemplate algorithmEstimationTemplate;
@@ -156,17 +154,5 @@ MemoryEstimation indirectExposure() {
     }
 
 
-    public  MemoryEstimation speakerListenerLPA() {
-        return new SpeakerListenerLPAMemoryEstimateDefinition().memoryEstimation();
-    }
-
-    public MemoryEstimateResult speakerListenerLPA(SpeakerListenerLPAConfig configuration, Object graphNameOrConfiguration) {
-        var memoryEstimation = speakerListenerLPA();
 
-        return algorithmEstimationTemplate.estimate(
-            configuration,
-            graphNameOrConfiguration,
-            memoryEstimation
-        );
-    }
 }
diff --git a/.../gds/applications/algorithms/centrality/CentralityAlgorithmsMutateModeBusinessFacade.java b/.../gds/applications/algorithms/centrality/CentralityAlgorithmsMutateModeBusinessFacade.java
@@ -26,7 +26,6 @@
 import org.neo4j.gds.applications.algorithms.machinery.ResultBuilder;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
 import org.neo4j.gds.articulationpoints.ArticulationPointsMutateConfig;
-import org.neo4j.gds.beta.pregel.PregelResult;
 import org.neo4j.gds.betweenness.BetweennessCentralityMutateConfig;
 import org.neo4j.gds.betweenness.BetwennessCentralityResult;
 import org.neo4j.gds.closeness.ClosenessCentralityMutateConfig;
@@ -43,7 +42,6 @@
 import org.neo4j.gds.pagerank.EigenvectorMutateConfig;
 import org.neo4j.gds.pagerank.PageRankMutateConfig;
 import org.neo4j.gds.pagerank.PageRankResult;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
 
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticleRank;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticulationPoints;
@@ -55,7 +53,6 @@
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.HarmonicCentrality;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.IndirectExposure;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.PageRank;
-import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.SLLPA;
 
 public class CentralityAlgorithmsMutateModeBusinessFacade {
     private final CentralityAlgorithmsEstimationModeBusinessFacade estimation;
@@ -256,21 +253,5 @@ public <RESULT> RESULT indirectExposure(
         );
     }
 
-    public <RESULT> RESULT speakerListenerLPA(
-        GraphName graphName,
-        SpeakerListenerLPAConfig configuration,
-        ResultBuilder<SpeakerListenerLPAConfig, PregelResult, RESULT, NodePropertiesWritten> resultBuilder
-    ) {
-        var mutateStep = new SpeakerListenerLPAMutateStep(mutateNodeProperty, configuration);
 
-        return algorithmProcessingTemplateConvenience.processRegularAlgorithmInMutateMode(
-            graphName,
-            configuration,
-            SLLPA,
-            estimation::indirectExposure,
-            (graph, __) -> algorithms.speakerListenerLPA(graph, configuration),
-            mutateStep,
-            resultBuilder
-        );
-    }
 }
diff --git a/...j/gds/applications/algorithms/centrality/CentralityAlgorithmsStatsModeBusinessFacade.java b/...j/gds/applications/algorithms/centrality/CentralityAlgorithmsStatsModeBusinessFacade.java
@@ -25,7 +25,6 @@
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTemplateConvenience;
 import org.neo4j.gds.applications.algorithms.machinery.StatsResultBuilder;
 import org.neo4j.gds.articulationpoints.ArticulationPointsStatsConfig;
-import org.neo4j.gds.beta.pregel.PregelResult;
 import org.neo4j.gds.betweenness.BetweennessCentralityStatsConfig;
 import org.neo4j.gds.closeness.ClosenessCentralityStatsConfig;
 import org.neo4j.gds.degree.DegreeCentralityStatsConfig;
@@ -36,7 +35,6 @@
 import org.neo4j.gds.pagerank.EigenvectorStatsConfig;
 import org.neo4j.gds.pagerank.PageRankResult;
 import org.neo4j.gds.pagerank.PageRankStatsConfig;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
 
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticleRank;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticulationPoints;
@@ -47,7 +45,6 @@
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.EigenVector;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.HarmonicCentrality;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.PageRank;
-import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.SLLPA;
 
 public class CentralityAlgorithmsStatsModeBusinessFacade {
     private final CentralityAlgorithmsEstimationModeBusinessFacade estimationFacade;
@@ -199,18 +196,5 @@ public <RESULT> RESULT pageRank(
         );
     }
 
-    public <RESULT> RESULT sllpa(
-        GraphName graphName,
-        SpeakerListenerLPAConfig configuration,
-        StatsResultBuilder<PregelResult, RESULT> resultBuilder
-    ) {
-        return algorithmProcessingTemplateConvenience.processRegularAlgorithmInStatsMode(
-            graphName,
-            configuration,
-            SLLPA,
-            estimationFacade::speakerListenerLPA,
-            (graph, __) -> centralityAlgorithms.speakerListenerLPA(graph, configuration),
-            resultBuilder
-        );
-    }
+
 }
diff --git a/.../gds/applications/algorithms/centrality/CentralityAlgorithmsStreamModeBusinessFacade.java b/.../gds/applications/algorithms/centrality/CentralityAlgorithmsStreamModeBusinessFacade.java
@@ -25,7 +25,6 @@
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTemplateConvenience;
 import org.neo4j.gds.applications.algorithms.machinery.StreamResultBuilder;
 import org.neo4j.gds.articulationpoints.ArticulationPointsStreamConfig;
-import org.neo4j.gds.beta.pregel.PregelResult;
 import org.neo4j.gds.betweenness.BetweennessCentralityStreamConfig;
 import org.neo4j.gds.bridges.BridgeResult;
 import org.neo4j.gds.bridges.BridgesStreamConfig;
@@ -39,7 +38,6 @@
 import org.neo4j.gds.pagerank.EigenvectorStreamConfig;
 import org.neo4j.gds.pagerank.PageRankResult;
 import org.neo4j.gds.pagerank.PageRankStreamConfig;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
 
 import java.util.stream.Stream;
 
@@ -53,7 +51,6 @@
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.EigenVector;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.HarmonicCentrality;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.PageRank;
-import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.SLLPA;
 
 public class CentralityAlgorithmsStreamModeBusinessFacade {
     private final CentralityAlgorithmsEstimationModeBusinessFacade estimationFacade;
@@ -220,18 +217,4 @@ public <RESULT> Stream<RESULT> pageRank(
         );
     }
 
-    public <RESULT> Stream<RESULT> sllpa(
-        GraphName graphName,
-        SpeakerListenerLPAConfig configuration,
-        StreamResultBuilder<PregelResult, RESULT> streamResultBuilder
-    ) {
-        return algorithmProcessingTemplateConvenience.processRegularAlgorithmInStreamMode(
-            graphName,
-            configuration,
-            SLLPA,
-            estimationFacade::pageRank,
-            (graph, __) -> centralityAlgorithms.speakerListenerLPA(graph, configuration),
-            streamResultBuilder
-        );
-    }
 }
diff --git a/...j/gds/applications/algorithms/centrality/CentralityAlgorithmsWriteModeBusinessFacade.java b/...j/gds/applications/algorithms/centrality/CentralityAlgorithmsWriteModeBusinessFacade.java
@@ -29,7 +29,6 @@
 import org.neo4j.gds.applications.algorithms.machinery.WriteToDatabase;
 import org.neo4j.gds.applications.algorithms.metadata.NodePropertiesWritten;
 import org.neo4j.gds.articulationpoints.ArticulationPointsWriteConfig;
-import org.neo4j.gds.beta.pregel.PregelResult;
 import org.neo4j.gds.betweenness.BetweennessCentralityWriteConfig;
 import org.neo4j.gds.closeness.ClosenessCentralityWriteConfig;
 import org.neo4j.gds.degree.DegreeCentralityWriteConfig;
@@ -42,7 +41,6 @@
 import org.neo4j.gds.pagerank.EigenvectorWriteConfig;
 import org.neo4j.gds.pagerank.PageRankResult;
 import org.neo4j.gds.pagerank.PageRankWriteConfig;
-import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
 
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticleRank;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.ArticulationPoints;
@@ -53,7 +51,6 @@
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.EigenVector;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.HarmonicCentrality;
 import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.PageRank;
-import static org.neo4j.gds.applications.algorithms.machinery.AlgorithmLabel.SLLPA;
 
 public final class CentralityAlgorithmsWriteModeBusinessFacade {
     private final CentralityAlgorithmsEstimationModeBusinessFacade estimationFacade;
@@ -251,22 +248,4 @@ public <RESULT> RESULT pageRank(
         );
     }
 
-    public <RESULT> RESULT sllpa(
-        GraphName graphName,
-        SpeakerListenerLPAConfig configuration,
-        ResultBuilder<SpeakerListenerLPAConfig, PregelResult, RESULT, NodePropertiesWritten> resultBuilder
-    ) {
-        var writeStep = new SpeakerListenerLPAWriteStep(writeToDatabase, configuration, SLLPA);
-
-        return algorithmProcessingTemplateConvenience.processRegularAlgorithmInWriteMode(
-            graphName,
-            configuration,
-            SLLPA,
-            estimationFacade::speakerListenerLPA,
-            (graph, __) -> centralityAlgorithms.speakerListenerLPA(graph, configuration),
-            writeStep,
-            resultBuilder
-        );
-    }
-
 }
diff --git a/applications/algorithms/community/build.gradle b/applications/algorithms/community/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     implementation project(":graph-schema-api")
     implementation project(":logging")
     implementation project(":memory-usage")
+    implementation project(":pregel")
     implementation project(":progress-tracking")
     implementation project(":termination")
 }
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
@@ -27,6 +27,7 @@
 import org.neo4j.gds.approxmaxkcut.ApproxMaxKCut;
 import org.neo4j.gds.approxmaxkcut.ApproxMaxKCutResult;
 import org.neo4j.gds.approxmaxkcut.config.ApproxMaxKCutBaseConfig;
+import org.neo4j.gds.beta.pregel.PregelResult;
 import org.neo4j.gds.collections.ha.HugeLongArray;
 import org.neo4j.gds.conductance.Conductance;
 import org.neo4j.gds.conductance.ConductanceBaseConfig;
@@ -68,6 +69,9 @@
 import org.neo4j.gds.modularityoptimization.ModularityOptimizationResult;
 import org.neo4j.gds.scc.Scc;
 import org.neo4j.gds.scc.SccCommonBaseConfig;
+import org.neo4j.gds.sllpa.SpeakerListenerLPA;
+import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
+import org.neo4j.gds.sllpa.SpeakerListenerLPAProgressTrackerCreator;
 import org.neo4j.gds.termination.TerminationFlag;
 import org.neo4j.gds.triangle.IntersectingTriangleCount;
 import org.neo4j.gds.triangle.IntersectingTriangleCountFactory;
@@ -76,8 +80,8 @@
 import org.neo4j.gds.triangle.LocalClusteringCoefficientResult;
 import org.neo4j.gds.triangle.TriangleCountBaseConfig;
 import org.neo4j.gds.triangle.TriangleCountResult;
-import org.neo4j.gds.triangle.TriangleStream;
 import org.neo4j.gds.triangle.TriangleResult;
+import org.neo4j.gds.triangle.TriangleStream;
 import org.neo4j.gds.wcc.Wcc;
 import org.neo4j.gds.wcc.WccBaseConfig;
 
@@ -489,4 +493,19 @@ private K1ColoringBaseConfig createModularityConfig() {
             .build();
 
     }
+
+    PregelResult speakerListenerLPA(Graph graph, SpeakerListenerLPAConfig configuration){
+        var task  = SpeakerListenerLPAProgressTrackerCreator.progressTask(graph.nodeCount(),configuration.maxIterations(),AlgorithmLabel.SLLPA.asString());
+        var progressTracker = progressTrackerCreator.createProgressTracker(configuration, task);
+
+        var algorithm = new SpeakerListenerLPA(
+            graph,
+            configuration,
+            DefaultPool.INSTANCE,
+            progressTracker,
+            Optional.empty()
+        );
+
+        return algorithmMachinery.runAlgorithmsAndManageProgressTracker(algorithm, progressTracker, true);
+    }
 }
diff --git a/...ds/applications/algorithms/community/CommunityAlgorithmsEstimationModeBusinessFacade.java b/...ds/applications/algorithms/community/CommunityAlgorithmsEstimationModeBusinessFacade.java
@@ -44,6 +44,8 @@
 import org.neo4j.gds.modularityoptimization.ModularityOptimizationMemoryEstimateDefinition;
 import org.neo4j.gds.scc.SccBaseConfig;
 import org.neo4j.gds.scc.SccMemoryEstimateDefinition;
+import org.neo4j.gds.sllpa.SpeakerListenerLPAConfig;
+import org.neo4j.gds.sllpa.SpeakerListenerLPAMemoryEstimateDefinition;
 import org.neo4j.gds.triangle.IntersectingTriangleCountMemoryEstimateDefinition;
 import org.neo4j.gds.triangle.LocalClusteringCoefficientBaseConfig;
 import org.neo4j.gds.triangle.LocalClusteringCoefficientMemoryEstimateDefinition;
@@ -259,4 +261,18 @@ public MemoryEstimateResult wcc(WccBaseConfig configuration, Object graphNameOrC
             memoryEstimation
         );
     }
+
+    public  MemoryEstimation speakerListenerLPA() {
+        return new SpeakerListenerLPAMemoryEstimateDefinition().memoryEstimation();
+    }
+
+    public MemoryEstimateResult speakerListenerLPA(SpeakerListenerLPAConfig configuration, Object graphNameOrConfiguration) {
+        var memoryEstimation = speakerListenerLPA();
+
+        return algorithmEstimationTemplate.estimate(
+            configuration,
+            graphNameOrConfiguration,
+            memoryEstimation
+        );
+    }
 }