Skip to content

Commit 1201ba0

Browse files
authored
Merge pull request #9896 from lassewesth/diespecs15
migrate estimation cli modularity tings to application layer
2 parents 7e5b48b + 9946096 commit 1201ba0

19 files changed

+18
-903
lines changed

algo/src/main/java/org/neo4j/gds/louvain/LouvainAlgorithmFactory.java

Lines changed: 0 additions & 81 deletions
This file was deleted.

algo/src/main/java/org/neo4j/gds/modularity/ModularityCalculatorFactory.java

Lines changed: 0 additions & 50 deletions
This file was deleted.

algo/src/main/java/org/neo4j/gds/modularityoptimization/ModularityOptimizationFactory.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

algo/src/test/java/org/neo4j/gds/modularityoptimization/FootballTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,12 @@ private ModularityOptimizationResult compute(
113113
int minBatchSize,
114114
Log log
115115
) {
116-
var task = ModularityOptimizationFactory.progressTask(graph, maxIterations);
117-
var progressTracker = new TestProgressTracker(task, log, concurrency, EmptyTaskRegistryFactory.INSTANCE);
116+
var progressTask = ModularityOptimizationProgressTrackerTaskCreator.progressTask(
117+
graph.nodeCount(),
118+
graph.relationshipCount(),
119+
maxIterations
120+
);
121+
var progressTracker = new TestProgressTracker(progressTask, log, concurrency, EmptyTaskRegistryFactory.INSTANCE);
118122

119123
return new ModularityOptimization(
120124
graph,

algo/src/test/java/org/neo4j/gds/modularityoptimization/ModularityOptimizationTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,12 @@ private ModularityOptimizationResult compute(
180180
int minBatchSize,
181181
Log log
182182
) {
183-
var task = ModularityOptimizationFactory.progressTask(graph, maxIterations);
184-
var progressTracker = new TestProgressTracker(task, log, concurrency, EmptyTaskRegistryFactory.INSTANCE);
183+
var progressTask = ModularityOptimizationProgressTrackerTaskCreator.progressTask(
184+
graph.nodeCount(),
185+
graph.relationshipCount(),
186+
maxIterations
187+
);
188+
var progressTracker = new TestProgressTracker(progressTask, log, concurrency, EmptyTaskRegistryFactory.INSTANCE);
185189
return new ModularityOptimization(
186190
graph,
187191
maxIterations,

algo/src/test/java/org/neo4j/gds/modularityoptimization/ModularityOptimizationWithoutOrientationTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,12 @@ private ModularityOptimizationResult compute(
273273
int minBatchSize,
274274
Log log
275275
) {
276-
var task = ModularityOptimizationFactory.progressTask(graph, maxIterations);
277-
var progressTracker = new TestProgressTracker(task, log, concurrency, EmptyTaskRegistryFactory.INSTANCE);
276+
var progressTask = ModularityOptimizationProgressTrackerTaskCreator.progressTask(
277+
graph.nodeCount(),
278+
graph.relationshipCount(),
279+
maxIterations
280+
);
281+
var progressTracker = new TestProgressTracker(progressTask, log, concurrency, EmptyTaskRegistryFactory.INSTANCE);
278282

279283
return new ModularityOptimization(
280284
graph,

algorithm-specifications/src/main/java/org/neo4j/gds/louvain/Constants.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

algorithm-specifications/src/main/java/org/neo4j/gds/louvain/LouvainMutateSpec.java

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)