Migrate Approximate K-Cut estimate to facade

neo4j · Oct 11, 2023 · e2adad6 · e2adad6
1 parent 3bdd1f8
commit e2adad6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/...in/java/org/neo4j/gds/algorithms/community/CommunityAlgorithmsEstimateBusinessFacade.java b/...in/java/org/neo4j/gds/algorithms/community/CommunityAlgorithmsEstimateBusinessFacade.java
@@ -24,6 +24,8 @@
 import org.neo4j.gds.api.DatabaseId;
 import org.neo4j.gds.api.GraphName;
 import org.neo4j.gds.api.User;
+import org.neo4j.gds.approxmaxkcut.ApproxMaxKCutAlgorithmFactory;
+import org.neo4j.gds.approxmaxkcut.config.ApproxMaxKCutBaseConfig;
 import org.neo4j.gds.config.AlgoBaseConfig;
 import org.neo4j.gds.core.GraphDimensions;
 import org.neo4j.gds.core.loading.GraphStoreCatalogService;
@@ -95,6 +97,16 @@ public <C extends WccBaseConfig> MemoryEstimateResult wcc(Object graphNameOrConf
         );
     }
 
+
+    public <C extends ApproxMaxKCutBaseConfig> MemoryEstimateResult approxMaxKCut(Object graphNameOrConfiguration, C configuration) {
+        return estimate(
+            graphNameOrConfiguration,
+            configuration,
+            configuration.relationshipWeightProperty(),
+            new ApproxMaxKCutAlgorithmFactory<>()
+        );
+    }
+
     public <C extends K1ColoringBaseConfig> MemoryEstimateResult k1Coloring(
         Object graphNameOrConfiguration,
         C configuration

diff --git a/proc/community/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutMutateProc.java b/proc/community/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutMutateProc.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.approxmaxkcut;
 
 import org.neo4j.gds.BaseProc;
-import org.neo4j.gds.executor.MemoryEstimationExecutor;
 import org.neo4j.gds.procedures.GraphDataScience;
 import org.neo4j.gds.procedures.community.approxmaxkcut.ApproxMaxKCutMutateResult;
 import org.neo4j.gds.results.MemoryEstimateResult;
@@ -55,11 +54,7 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return new MemoryEstimationExecutor<>(
-            new ApproxMaxKCutMutateSpec(),
-            executionContext(),
-            transactionContext()
-        ).computeEstimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.community().approxMaxKCutEstimateMutate(graphNameOrConfiguration, algoConfiguration);
     }
 
     @Deprecated

diff --git a/proc/community/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutStreamProc.java b/proc/community/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutStreamProc.java
@@ -20,7 +20,6 @@
 package org.neo4j.gds.approxmaxkcut;
 
 import org.neo4j.gds.BaseProc;
-import org.neo4j.gds.executor.MemoryEstimationExecutor;
 import org.neo4j.gds.procedures.GraphDataScience;
 import org.neo4j.gds.procedures.community.approxmaxkcut.ApproxMaxKCutStreamResult;
 import org.neo4j.gds.results.MemoryEstimateResult;
@@ -55,11 +54,7 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return new MemoryEstimationExecutor<>(
-            new ApproxMaxKCutStreamSpec(),
-            executionContext(),
-            transactionContext()
-        ).computeEstimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.community().approxMaxKCutEstimateStream(graphNameOrConfiguration, algoConfiguration);
     }
 
     @Deprecated

diff --git a/...res/facade/src/main/java/org/neo4j/gds/procedures/community/CommunityProcedureFacade.java b/...res/facade/src/main/java/org/neo4j/gds/procedures/community/CommunityProcedureFacade.java
@@ -1315,8 +1315,6 @@ public Stream<MemoryEstimateResult> k1ColoringEstimateWrite(
         return Stream.of(estimateBusinessFacade.k1Coloring(graphNameOrConfiguration, config));
     }
 
-
-
     public Stream<ConductanceStreamResult> conductanceStream(
         String graphName,
         Map<String, Object> configuration
@@ -1368,6 +1366,22 @@ public Stream<ApproxMaxKCutMutateResult> approxMaxKCutMutate(
         return Stream.of(ApproxMaxKCutComputationResultTransformer.toMutateResult(computationResult));
     }
 
+    public Stream<MemoryEstimateResult> approxMaxKCutEstimateStream(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algoConfiguration
+    ) {
+        var config = createConfig(algoConfiguration, ApproxMaxKCutStreamConfig::of);
+        return Stream.of(estimateBusinessFacade.approxMaxKCut(graphNameOrConfiguration, config));
+    }
+
+    public Stream<MemoryEstimateResult> approxMaxKCutEstimateMutate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algoConfiguration
+    ) {
+        var config = createConfig(algoConfiguration, ApproxMaxKCutMutateConfig::of);
+        return Stream.of(estimateBusinessFacade.approxMaxKCut(graphNameOrConfiguration, config));
+    }
+
     public Stream<AlphaSccWriteResult> alphaSccWrite(
         String graphName,
         Map<String, Object> configuration