diff --git a/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/EigenvectorCentralityComputeStep.java b/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/EigenvectorCentralityComputeStep.java index a981546cf..92ea6ddc0 100644 --- a/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/EigenvectorCentralityComputeStep.java +++ b/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/EigenvectorCentralityComputeStep.java @@ -99,12 +99,4 @@ void normalizeDeltas() { deltas[i] = deltas[i] / l2Norm; } } - - @Override - public String toString() { - return "EigenvectorCentralityComputeStep{" + - "partitionSize=" + partitionSize + - ", startNode=" + startNode + - '}'; - } } diff --git a/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/PageRank.java b/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/PageRank.java index 079965da9..4eba4d967 100644 --- a/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/PageRank.java +++ b/algo/src/main/java/org/neo4j/graphalgo/impl/pagerank/PageRank.java @@ -352,7 +352,7 @@ CentralityResult getPageRank() { private void run(int iterations) { // initialize data structures ParallelUtil.runWithConcurrency(concurrency, steps, pool); - for (int i = 0; i < iterations && running(); i++) { + for (int iteration = 0; iteration < iterations && running(); iteration++) { // calculate scores ParallelUtil.runWithConcurrency(concurrency, steps, 3, 1, TimeUnit.SECONDS, pool); @@ -382,7 +382,8 @@ private double computeNorm() { } l2Norm = Math.sqrt(l2Norm); - l2Norm = l2Norm < 0 ? 1: l2Norm; + + l2Norm = l2Norm <= 0 ? 1 : l2Norm; return l2Norm; } diff --git a/core/src/main/java/org/neo4j/graphalgo/core/utils/ParallelUtil.java b/core/src/main/java/org/neo4j/graphalgo/core/utils/ParallelUtil.java index 96911aed5..4d36ad6fe 100644 --- a/core/src/main/java/org/neo4j/graphalgo/core/utils/ParallelUtil.java +++ b/core/src/main/java/org/neo4j/graphalgo/core/utils/ParallelUtil.java @@ -671,7 +671,6 @@ private static void runWithConcurrency( int maxWaitRetries, TerminationFlag terminationFlag, ExecutorService executor) { - if (!canRunInParallel(executor) || tasks.size() == 1 || concurrency <= 1) { @@ -705,9 +704,7 @@ private static void runWithConcurrency( while (ts.hasNext()) { if (completionService.hasTasks()) { try { - System.out.println("[ParallelUtil#runWithConcurrency] waiting for task to finish... " + executor); completionService.awaitNext(); - System.out.println("[ParallelUtil#runWithConcurrency] task finished... " + executor); } catch (ExecutionException e) { error = Exceptions.chain(error, e.getCause()); } catch (CancellationException ignore) { @@ -884,7 +881,6 @@ protected void done() { if (executor instanceof ThreadPoolExecutor) { pool = (ThreadPoolExecutor) executor; availableConcurrency = pool.getCorePoolSize(); -// availableConcurrency = 2; int capacity = Math.max(targetConcurrency, availableConcurrency) + 1; completionQueue = new ArrayBlockingQueue<>(capacity); } else {