Skip to content

Commit dcc7b98

Browse files
authored
Merge pull request #5330 from vnickolov/leiden-algo-benchmark
leiden algo benchmark
2 parents 21df19d + 121cd4c commit dcc7b98

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

algo/src/main/java/org/neo4j/gds/leiden/Leiden.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,15 @@ public class Leiden extends Algorithm<HugeLongArray> {
5050
private final int concurrency;
5151
private final long seed;
5252

53-
Leiden(Graph graph, int maxIterations, double gamma, double theta, long seed, ProgressTracker progressTracker) {
53+
public Leiden(
54+
Graph graph,
55+
int maxIterations,
56+
double gamma,
57+
double theta,
58+
long seed,
59+
int concurrency,
60+
ProgressTracker progressTracker
61+
) {
5462
super(progressTracker);
5563
this.rootGraph = graph;
5664
this.maxIterations = maxIterations;
@@ -60,7 +68,8 @@ public class Leiden extends Algorithm<HugeLongArray> {
6068

6169
// TODO: Pass these two as parameters
6270
this.executorService = Pools.DEFAULT;
63-
this.concurrency = 4;
71+
this.concurrency = concurrency;
72+
6473
this.dendrograms = new HugeLongArray[maxIterations];
6574
}
6675

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class FootballTest {
5252
@ValueSource(longs = {99999, 25, 323, 405, 58, 61, 7, 8123, 94, 19})
5353
void leiden(long seed) {
5454
var gamma = 1.0 / graph.relationshipCount();
55-
Leiden leiden = new Leiden(graph, 5, gamma, 0.01, seed, ProgressTracker.NULL_TRACKER);
55+
Leiden leiden = new Leiden(graph, 5, gamma, 0.01, seed, 1, ProgressTracker.NULL_TRACKER);
5656
var communities = leiden.compute();
5757
var communitiesMap = LongStream
5858
.range(0, graph.nodeCount())

algo/src/test/java/org/neo4j/gds/leiden/KarateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class KarateTest {
4949
@ValueSource(longs = {99999, 25, 323, 405, 58, 61, 7, 8123, 94, 19})
5050
void leiden(long seed) {
5151
var gamma = 1.0 / graph.relationshipCount();
52-
Leiden leiden = new Leiden(graph, 5, gamma, 0.01, seed, ProgressTracker.NULL_TRACKER);
52+
Leiden leiden = new Leiden(graph, 5, gamma, 0.01, seed, 1, ProgressTracker.NULL_TRACKER);
5353
var communities = leiden.compute();
5454
var communitiesMap = LongStream
5555
.range(0, graph.nodeCount())

algo/src/test/java/org/neo4j/gds/leiden/LeidenTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ class LeidenTest {
7474

7575
@Test
7676
void leiden() {
77-
Leiden leiden = new Leiden(graph, 2, 1.0 / graph.relationshipCount(), 0.01, 19L, ProgressTracker.NULL_TRACKER);
77+
Leiden leiden = new Leiden(graph, 2, 1.0 / graph.relationshipCount(), 0.01, 19L, 1, ProgressTracker.NULL_TRACKER
78+
);
7879
var communities = leiden.compute();
7980
var communitiesMap = LongStream
8081
.range(0, graph.nodeCount())

0 commit comments

Comments
 (0)