Skip to content

Commit 5956b99

Browse files
Add HDBScanBenchmark
And some small cosmetic changes Co-Authored-By: Ioannis Panagiotas <ioannis.panagiotas@neo4j.com>
1 parent 90a369b commit 5956b99

File tree

5 files changed

+17
-12
lines changed

5 files changed

+17
-12
lines changed

algo/src/main/java/org/neo4j/gds/hdbscan/BoruvkaMST.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public GeometricMSTResult compute() {
114114
}
115115

116116
private void performIteration() {
117-
if (!closestDistanceTracker.isUpdated()) {
117+
if (closestDistanceTracker.isNotUpdated()) {
118118

119119
ParallelUtil.parallelForEachNode(
120120
nodeCount, concurrency, terminationFlag,

algo/src/main/java/org/neo4j/gds/hdbscan/ClosestDistanceInformationTracker.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,29 @@ static ClosestDistanceInformationTracker create(long size, HugeDoubleArray cores
6565
tracker.tryToAssign(u, u, neighbor, adaptedDistance);
6666
}
6767
}
68-
tracker.setUpdated(true);
68+
tracker.updated();
6969

7070
return tracker;
7171

7272
}
7373

74-
private void setUpdated(boolean updated) {
75-
this.updated = updated;
74+
private void updated() {
75+
this.updated = true;
7676
}
7777

78-
boolean isUpdated() {
79-
return updated;
78+
private void notUpdated() {
79+
this.updated = false;
80+
}
81+
82+
boolean isNotUpdated() {
83+
return !updated;
8084
}
8185

8286
void reset(long upTo) {
8387
for (long u = 0; u < upTo; ++u) {
8488
resetComponent(u);
8589
}
86-
setUpdated(false);
90+
notUpdated();
8791
}
8892

8993
void resetComponent(long u) {

algo/src/main/java/org/neo4j/gds/hdbscan/DualTreeMSTAlgorithm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void resetNodeBounds() {
136136
}
137137

138138
private void performIteration() {
139-
if (!closestDistanceTracker.isUpdated()) {
139+
if (closestDistanceTracker.isNotUpdated()) {
140140
resetNodeBounds();
141141
traversalStep(kdTree.root(), kdTree.root());
142142
}

algo/src/main/java/org/neo4j/gds/hdbscan/HDBScan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class HDBScan extends Algorithm<HugeLongArray> {
4040
private final int samples;
4141
private final long minClusterSize;
4242

43-
protected HDBScan(
43+
public HDBScan(
4444
IdMap nodes,
4545
NodePropertyValues nodePropertyValues,
4646
Concurrency concurrency,

algo/src/test/java/org/neo4j/gds/hdbscan/BoruvkaMSTTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.junit.jupiter.params.ParameterizedTest;
2525
import org.junit.jupiter.params.provider.ValueSource;
2626
import org.neo4j.gds.core.concurrency.Concurrency;
27+
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
2728
import org.neo4j.gds.extension.GdlExtension;
2829
import org.neo4j.gds.extension.GdlGraph;
2930
import org.neo4j.gds.extension.Inject;
@@ -61,7 +62,7 @@ class Case1 {
6162
@ValueSource(ints={1,4})
6263
void shouldReturnEuclideanMSTWithZeroCoreValues(int concurrency) {
6364
var nodePropertyValues = graph.nodeProperties("point");
64-
var kdTree = new KdTreeBuilder(graph, nodePropertyValues, 1, 1).build();
65+
var kdTree = new KdTreeBuilder(graph, nodePropertyValues, 1, 1, ProgressTracker.NULL_TRACKER).build();
6566

6667
var dualTree = BoruvkaMST.createWithZeroCores(
6768
nodePropertyValues,
@@ -118,7 +119,7 @@ class Case2 {
118119
@ValueSource(ints={1,4})
119120
void shouldReturnEuclideanMSTWithZeroCoreValues(int concurrency) {
120121
var nodePropertyValues = graph.nodeProperties("point");
121-
var kdTree = new KdTreeBuilder(graph, nodePropertyValues, 1, 1).build();
122+
var kdTree = new KdTreeBuilder(graph, nodePropertyValues, 1, 1, ProgressTracker.NULL_TRACKER).build();
122123

123124
var dualTree = BoruvkaMST.createWithZeroCores(
124125
nodePropertyValues,
@@ -175,7 +176,7 @@ class Case3 {
175176
@ValueSource(ints={1,4})
176177
void shouldReturnEuclideanMSTWithZeroCoreValues(int concurrency) {
177178
var nodePropertyValues = graph.nodeProperties("point");
178-
var kdTree = new KdTreeBuilder(graph, nodePropertyValues, 1, 1).build();
179+
var kdTree = new KdTreeBuilder(graph, nodePropertyValues, 1, 1, ProgressTracker.NULL_TRACKER).build();
179180

180181
var dualTree = BoruvkaMST.createWithZeroCores(
181182
nodePropertyValues,

0 commit comments

Comments
 (0)