Skip to content

Commit 576fae2

Browse files
committed
Rename maxIdx nodeCount/valueCount
Also replace all usage of `valuesStored`
1 parent 8c032cb commit 576fae2

File tree

78 files changed

+131
-570
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+131
-570
lines changed

algo-common/src/main/java/org/neo4j/gds/scaling/ScaleProperties.java

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,8 @@ public double doubleValue(long nodeId) {
225225
}
226226

227227
@Override
228-
public long valuesStored() {
229-
return property.valuesStored();
230-
}
231-
232-
@Override
233-
public long maxIndex() {
234-
return property.maxIndex();
228+
public long nodeCount() {
229+
return property.nodeCount();
235230
}
236231
};
237232
}
@@ -249,13 +244,8 @@ public double doubleValue(long nodeId) {
249244
}
250245

251246
@Override
252-
public long valuesStored() {
253-
return property.valuesStored();
254-
}
255-
256-
@Override
257-
public long maxIndex() {
258-
return property.maxIndex();
247+
public long nodeCount() {
248+
return property.nodeCount();
259249
}
260250
};
261251
}
@@ -273,13 +263,8 @@ public double doubleValue(long nodeId) {
273263
}
274264

275265
@Override
276-
public long valuesStored() {
277-
return property.valuesStored();
278-
}
279-
280-
@Override
281-
public long maxIndex() {
282-
return property.maxIndex();
266+
public long nodeCount() {
267+
return property.nodeCount();
283268
}
284269
};
285270
}

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -414,14 +414,8 @@ public LongNodePropertyValues asNodeProperties() {
414414
public long longValue(long nodeId) {
415415
return getCommunityId(nodeId);
416416
}
417-
418-
@Override
419-
public long valuesStored() {
420-
return currentCommunities.size();
421-
}
422-
423-
@Override
424-
public long maxIndex() {
417+
@Override
418+
public long nodeCount() {
425419
return graph.nodeCount();
426420
}
427421
};

algo/src/main/java/org/neo4j/gds/pagerank/EigenvectorComputation.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,7 @@ public boolean masterCompute(MasterComputeContext<PageRankConfig> context) {
115115

116116
var properties = new DoubleNodePropertyValues() {
117117
@Override
118-
public long valuesStored() {
119-
return context.nodeCount();
120-
}
121-
122-
@Override
123-
public long maxIndex() {
118+
public long nodeCount() {
124119
return context.nodeCount();
125120
}
126121

algo/src/main/java/org/neo4j/gds/similarity/knn/metrics/LongArrayPropertySimilarityComputer.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static final class SortedLongArrayPropertyValues implements LongArrayNodePropert
5555
private final HugeObjectArray<long[]> properties;
5656

5757
SortedLongArrayPropertyValues(NodePropertyValues nodePropertyValues) {
58-
this.properties = HugeObjectArray.newArray(long[].class, nodePropertyValues.maxIndex());
58+
this.properties = HugeObjectArray.newArray(long[].class, nodePropertyValues.nodeCount());
5959
this.properties.setAll(i -> {
6060
long[] input = nodePropertyValues.longArrayValue(i);
6161

@@ -70,12 +70,7 @@ static final class SortedLongArrayPropertyValues implements LongArrayNodePropert
7070
}
7171

7272
@Override
73-
public long valuesStored() {
74-
return properties.size();
75-
}
76-
77-
@Override
78-
public long maxIndex() {
73+
public long nodeCount() {
7974
return properties.size();
8075
}
8176

algo/src/main/java/org/neo4j/gds/similarity/knn/metrics/NullCheckingNodePropertyValues.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,8 @@ public Value value(long nodeId) {
8686
}
8787

8888
@Override
89-
public long valuesStored() {
90-
return properties.valuesStored();
91-
}
92-
93-
@Override
94-
public long maxIndex() {
95-
return properties.maxIndex();
89+
public long nodeCount() {
90+
return properties.nodeCount();
9691
}
9792

9893
private void check(long nodeId, @Nullable Object value) {

algo/src/test/java/org/neo4j/gds/similarity/knn/metrics/LongArrayPropertySimilarityComputerTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,8 @@ public long[] longArrayValue(long nodeId) {
3737
}
3838

3939
@Override
40-
public long valuesStored() {
41-
return 2;
42-
}
43-
44-
@Override
45-
public long maxIndex() {
46-
return 3;
40+
public long nodeCount() {
41+
return inputValues.length;
4742
}
4843
};
4944

algo/src/test/java/org/neo4j/gds/similarity/knn/metrics/SimilarityComputerTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,7 @@ public long[] longArrayValue(long nodeId) {
265265
}
266266

267267
@Override
268-
public long valuesStored() {
269-
return 0;
270-
}
271-
272-
@Override
273-
public long maxIndex() {
268+
public long nodeCount() {
274269
return nodeCount;
275270
}
276271
};

alpha/alpha-proc/src/main/java/org/neo4j/gds/centrality/HarmonicCentralityWriteProc.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,7 @@ public ComputationResultConsumer<HarmonicCentrality, HarmonicCentrality, Harmoni
9292

9393
var properties = new DoubleNodePropertyValues() {
9494
@Override
95-
public long valuesStored() {
96-
return computationResult.graph().nodeCount();
97-
}
98-
99-
@Override
100-
public long maxIndex() {
95+
public long nodeCount() {
10196
return computationResult.graph().nodeCount();
10297
}
10398

alpha/alpha-proc/src/main/java/org/neo4j/gds/influenceMaximization/CelfNodeProperties.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ class CelfNodeProperties implements DoubleNodePropertyValues {
3333
}
3434

3535
@Override
36-
public long valuesStored() {
37-
return celfSeedSet.size();
38-
}
39-
40-
@Override
41-
public long maxIndex() {
36+
public long nodeCount() {
4237
return totalGraphNodeCount;
4338
}
4439

alpha/alpha-proc/src/main/java/org/neo4j/gds/scaling/ScalePropertiesProc.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ static NodePropertyValues nodeProperties(ComputationResult<ScaleProperties, Scal
3333

3434
return new DoubleArrayNodePropertyValues() {
3535
@Override
36-
public long valuesStored() {
37-
return scaledProperties.size();
38-
}
39-
40-
@Override
41-
public long maxIndex() {
36+
public long nodeCount() {
4237
return size;
4338
}
4439

0 commit comments

Comments
 (0)