Skip to content
This repository was archived by the owner on Apr 22, 2020. It is now read-only.

Commit f519abf

Browse files
committed
simplify the code for working out partitions
1 parent 36ad67e commit f519abf

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

algo/src/main/java/org/neo4j/graphalgo/impl/DSSResult.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ public Stream<DisjointSetStruct.Result> resultStream(IdMapping idMapping) {
7373
: hugeStruct.resultStream(((HugeIdMapping) idMapping));
7474
}
7575

76-
public Stream<DisjointSetStruct.InternalResult> internalResultStream(IdMapping idMapping) {
77-
return struct.internalResultStream(idMapping);
78-
}
79-
8076
public void forEach(NodeIterator nodes, IntIntPredicate consumer) {
8177
if (struct != null) {
8278
nodes.forEachNode(nodeId -> consumer.apply(nodeId, struct.find(nodeId)));

algo/src/main/java/org/neo4j/graphalgo/similarity/ParallelSimilarityExporter.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import java.util.*;
4343
import java.util.concurrent.*;
4444
import java.util.concurrent.atomic.AtomicInteger;
45-
import java.util.concurrent.atomic.LongAdder;
4645
import java.util.stream.Collectors;
4746
import java.util.stream.Stream;
4847

@@ -82,7 +81,7 @@ public int export(Stream<SimilarityResult> similarityPairs, long batchSize) {
8281
idMap.buildMappedIds();
8382
HeavyGraph graph = new HeavyGraph(idMap, adjacencyMatrix, weightMap, Collections.emptyMap());
8483

85-
DSSResult dssResult = computePartitions(graph);
84+
DisjointSetStruct dssResult = computePartitions(graph);
8685

8786
Stream<List<DisjointSetStruct.InternalResult>> stream = dssResult.internalResultStream(graph)
8887
.collect(Collectors.groupingBy(item -> item.setId))
@@ -153,11 +152,11 @@ private static <T> void put(BlockingQueue<T> queue, T items) {
153152
}
154153
}
155154

156-
private DSSResult computePartitions(HeavyGraph graph) {
155+
private DisjointSetStruct computePartitions(HeavyGraph graph) {
157156
GraphUnionFind algo = new GraphUnionFind(graph);
158157
DisjointSetStruct struct = algo.compute();
159158
algo.release();
160-
return new DSSResult(struct);
159+
return struct;
161160
}
162161

163162
private void export(SimilarityResult similarityResult) {

0 commit comments

Comments
 (0)