fixes

neo4j · Nov 23, 2023 · 3460462 · 3460462
1 parent c921596
commit 3460462
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/...in/java/org/neo4j/gds/algorithms/centrality/CentralityAlgorithmsMutateBusinessFacade.java b/...in/java/org/neo4j/gds/algorithms/centrality/CentralityAlgorithmsMutateBusinessFacade.java
@@ -198,6 +198,24 @@ private NodePropertyMutateResult<PageRankSpecificFields> pageRankVariant(
                 configuration,
                 shouldComputeCentralityDistribution
             );
+
+            var specificFields = new PageRankSpecificFields(
+                result.iterations(),
+                result.didConverge(),
+                pageRankDistribution.centralitySummary
+            );
+
+            return NodePropertyMutateResult.<PageRankSpecificFields>builder()
+                .computeMillis(intermediateResult.computeMilliseconds)
+                .postProcessingMillis(pageRankDistribution.postProcessingMillis)
+                .nodePropertiesWritten(addNodePropertyResult.nodePropertiesAdded())
+                .mutateMillis(addNodePropertyResult.mutateMilliseconds())
+                .configuration(configuration)
+                .algorithmSpecificFields(specificFields)
+                .build();
+        }).orElseGet(() -> NodePropertyMutateResult.empty(PageRankSpecificFields.EMPTY, configuration));
+
+    }
     public NodePropertyMutateResult<CELFSpecificFields> celf(
         String graphName,
         InfluenceMaximizationMutateConfig configuration
@@ -235,22 +253,7 @@ public NodePropertyMutateResult<CELFSpecificFields> celf(
     }
 
 
-            var specificFields = new PageRankSpecificFields(
-                result.iterations(),
-                result.didConverge(),
-                pageRankDistribution.centralitySummary
-            );
 
-            return NodePropertyMutateResult.<PageRankSpecificFields>builder()
-                .computeMillis(intermediateResult.computeMilliseconds)
-                .postProcessingMillis(pageRankDistribution.postProcessingMillis)
-                .nodePropertiesWritten(addNodePropertyResult.nodePropertiesAdded())
-                .mutateMillis(addNodePropertyResult.mutateMilliseconds())
-                .configuration(configuration)
-                .algorithmSpecificFields(specificFields)
-                .build();
-        }).orElseGet(() -> NodePropertyMutateResult.empty(PageRankSpecificFields.EMPTY, configuration));
-    }
 
 
     private <RESULT extends CentralityAlgorithmResult, CONFIG extends MutateNodePropertyConfig> NodePropertyMutateResult<DefaultCentralitySpecificFields> mutateNodeProperty(

diff --git a/...ain/java/org/neo4j/gds/algorithms/centrality/CentralityAlgorithmsStatsBusinessFacade.java b/...ain/java/org/neo4j/gds/algorithms/centrality/CentralityAlgorithmsStatsBusinessFacade.java
@@ -34,9 +34,9 @@
 import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.degree.DegreeCentralityStatsConfig;
 import org.neo4j.gds.harmonic.HarmonicCentralityStatsConfig;
+import org.neo4j.gds.influenceMaximization.InfluenceMaximizationStatsConfig;
 import org.neo4j.gds.pagerank.PageRankResult;
 import org.neo4j.gds.pagerank.PageRankStatsConfig;
-import org.neo4j.gds.influenceMaximization.InfluenceMaximizationStatsConfig;
 import org.neo4j.gds.result.CentralityStatistics;
 
 import java.util.function.Supplier;

diff --git a/proc/centrality/src/main/java/org/neo4j/gds/influenceMaximization/CELFWriteProc.java b/proc/centrality/src/main/java/org/neo4j/gds/influenceMaximization/CELFWriteProc.java
@@ -56,7 +56,7 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.centrality().celfMutateEstimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.centrality().celfWriteEstimate(graphNameOrConfiguration, algoConfiguration);
     }
 
     @Procedure(