Skip to content

Commit 453e246

Browse files
committed
migrate estimation cli degree centrality to application layer
1 parent 6396664 commit 453e246

File tree

10 files changed

+17
-302
lines changed

10 files changed

+17
-302
lines changed

algo/src/main/java/org/neo4j/gds/degree/DegreeCentralityFactory.java

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

algorithm-specifications/src/main/java/org/neo4j/gds/degree/Constants.java renamed to algo/src/main/java/org/neo4j/gds/degree/DegreeCentralityTask.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,14 @@
1919
*/
2020
package org.neo4j.gds.degree;
2121

22-
final class Constants {
23-
static final String DEGREE_CENTRALITY_DESCRIPTION = "Degree centrality measures the number of incoming and outgoing relationships from a node.";
22+
import org.neo4j.gds.api.IdMap;
23+
import org.neo4j.gds.core.utils.progress.tasks.Task;
24+
import org.neo4j.gds.core.utils.progress.tasks.Tasks;
2425

25-
private Constants() {}
26+
public final class DegreeCentralityTask {
27+
private DegreeCentralityTask() {}
28+
29+
public static Task create(IdMap idMap) {
30+
return Tasks.leaf("DegreeCentrality", idMap.nodeCount());
31+
}
2632
}

algo/src/main/java/org/neo4j/gds/traversal/RandomWalkAlgorithmFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
import org.neo4j.gds.GraphAlgorithmFactory;
2323
import org.neo4j.gds.api.Graph;
2424
import org.neo4j.gds.core.concurrency.DefaultPool;
25+
import org.neo4j.gds.degree.DegreeCentralityTask;
2526
import org.neo4j.gds.mem.MemoryEstimation;
2627
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
2728
import org.neo4j.gds.core.utils.progress.tasks.Task;
2829
import org.neo4j.gds.core.utils.progress.tasks.Tasks;
29-
import org.neo4j.gds.degree.DegreeCentralityFactory;
3030
import org.neo4j.gds.termination.TerminationFlag;
3131

3232
import java.util.ArrayList;
@@ -62,7 +62,7 @@ public Task progressTask(
6262
) {
6363
var tasks = new ArrayList<Task>();
6464
if (graph.hasRelationshipProperty()) {
65-
tasks.add(DegreeCentralityFactory.degreeCentralityProgressTask(graph));
65+
tasks.add(DegreeCentralityTask.create(graph));
6666
}
6767
tasks.add(Tasks.leaf("create walks", graph.nodeCount()));
6868

algo/src/test/java/org/neo4j/gds/degree/DegreeCentralityTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void testProgressLogging(boolean weighted) {
156156
var concurrency = new Concurrency(4);
157157
var orientation = Orientation.NATURAL;
158158

159-
var progressTask = DegreeCentralityFactory.degreeCentralityProgressTask(graph);
159+
var progressTask = DegreeCentralityTask.create(graph);
160160
var log = new GdsTestLog();
161161
var progressTracker = new TestProgressTracker(progressTask, log, new Concurrency(1), EmptyTaskRegistryFactory.INSTANCE);
162162
var degreeCentrality = new DegreeCentrality(

algorithm-specifications/src/main/java/org/neo4j/gds/degree/DegreeCentralityMutateSpecification.java

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

algorithm-specifications/src/main/java/org/neo4j/gds/degree/DegreeCentralityStatsSpecification.java

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

algorithm-specifications/src/main/java/org/neo4j/gds/degree/DegreeCentralityStreamSpecification.java

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

algorithm-specifications/src/main/java/org/neo4j/gds/degree/DegreeCentralityWriteSpecification.java

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

applications/algorithms/node-embeddings/src/main/java/org/neo4j/gds/applications/algorithms/embeddings/NodeEmbeddingAlgorithms.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3030
import org.neo4j.gds.core.utils.progress.tasks.Task;
3131
import org.neo4j.gds.core.utils.progress.tasks.Tasks;
32-
import org.neo4j.gds.degree.DegreeCentralityFactory;
32+
import org.neo4j.gds.degree.DegreeCentralityTask;
3333
import org.neo4j.gds.embeddings.fastrp.FastRP;
3434
import org.neo4j.gds.embeddings.fastrp.FastRPBaseConfig;
3535
import org.neo4j.gds.embeddings.fastrp.FastRPConfigTransformer;
@@ -284,7 +284,7 @@ private static Task createHashGnnTask(Graph graph, HashGNNConfig configuration)
284284
private Task createNode2VecTask(Graph graph, Node2VecBaseConfig configuration) {
285285
var randomWalkTasks = new ArrayList<Task>();
286286
if (graph.hasRelationshipProperty()) {
287-
randomWalkTasks.add(DegreeCentralityFactory.degreeCentralityProgressTask(graph));
287+
randomWalkTasks.add(DegreeCentralityTask.create(graph));
288288
}
289289
randomWalkTasks.add(Tasks.leaf("create walks", graph.nodeCount()));
290290

applications/algorithms/path-finding/src/main/java/org/neo4j/gds/applications/algorithms/pathfinding/PathFindingAlgorithms.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import org.neo4j.gds.dag.topologicalsort.TopologicalSort;
4343
import org.neo4j.gds.dag.topologicalsort.TopologicalSortBaseConfig;
4444
import org.neo4j.gds.dag.topologicalsort.TopologicalSortResult;
45-
import org.neo4j.gds.degree.DegreeCentralityFactory;
45+
import org.neo4j.gds.degree.DegreeCentralityTask;
4646
import org.neo4j.gds.kspanningtree.KSpanningTree;
4747
import org.neo4j.gds.kspanningtree.KSpanningTreeBaseConfig;
4848
import org.neo4j.gds.paths.astar.AStar;
@@ -249,7 +249,7 @@ PathFindingResult longestPath(Graph graph, AlgoBaseConfig configuration) {
249249
Stream<long[]> randomWalk(Graph graph, RandomWalkBaseConfig configuration) {
250250
var tasks = new ArrayList<Task>();
251251
if (graph.hasRelationshipProperty()) {
252-
tasks.add(DegreeCentralityFactory.degreeCentralityProgressTask(graph));
252+
tasks.add(DegreeCentralityTask.create(graph));
253253
}
254254
tasks.add(Tasks.leaf("create walks", graph.nodeCount()));
255255
var task = Tasks.task(AlgorithmLabel.RandomWalk.asString(), tasks);
@@ -297,7 +297,7 @@ PrizeSteinerTreeResult pcst(Graph graph, PCSTBaseConfig configuration) {
297297
HugeAtomicLongArray randomWalkCountingNodeVisits(Graph graph, RandomWalkBaseConfig configuration) {
298298
var tasks = new ArrayList<Task>();
299299
if (graph.hasRelationshipProperty()) {
300-
tasks.add(DegreeCentralityFactory.degreeCentralityProgressTask(graph));
300+
tasks.add(DegreeCentralityTask.create(graph));
301301
}
302302
Task task;
303303
if (tasks.isEmpty()) {

0 commit comments

Comments
 (0)