Merge pull request #1590 from s1ck/bump-gds-dependency

Bump GDS dependency to 1.3.1 in K1ColoringExample

Author: jjaderberg

examples/PregelK1Coloring/build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 ext {
     // Make sure these are the same as your installation of GDS and Neo4j
-    gdsVersion = '1.2.1'
+    gdsVersion = '1.3.1'
     neo4jVersion = '4.0.4'
 
     // Necessary compile-time dependency for code generation

examples/PregelK1Coloring/src/main/java/gds/example/K1ColoringAlgorithm.java

@@ -21,9 +21,9 @@
 
 import org.neo4j.graphalgo.Algorithm;
 import org.neo4j.graphalgo.api.Graph;
+import org.neo4j.graphalgo.beta.pregel.ImmutablePregelConfig;
 import org.neo4j.graphalgo.beta.pregel.Pregel;
 import org.neo4j.graphalgo.beta.pregel.PregelConfig;
-import org.neo4j.graphalgo.config.AlgoBaseConfig;
 import org.neo4j.graphalgo.core.concurrency.Pools;
 import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
 import org.neo4j.graphalgo.core.utils.paged.HugeDoubleArray;
@@ -40,7 +40,7 @@ public class K1ColoringAlgorithm extends Algorithm<K1ColoringAlgorithm, HugeDoub
 
     @Override
     public HugeDoubleArray compute() {
-        PregelConfig config = new PregelConfig.Builder()
+        PregelConfig config = ImmutablePregelConfig.builder()
                 .isAsynchronous(true)
                 .build();
 
@@ -49,7 +49,6 @@ public HugeDoubleArray compute() {
                 config,
                 new K1ColoringExample(),
                 10,
-                AlgoBaseConfig.DEFAULT_CONCURRENCY,
                 Pools.DEFAULT,
                 AllocationTracker.EMPTY
         );

examples/PregelK1Coloring/src/test/java/gds/example/K1ColoringTest.java

@@ -21,14 +21,12 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.neo4j.graphalgo.AbstractNodeProjection;
-import org.neo4j.graphalgo.AbstractRelationshipProjection;
 import org.neo4j.graphalgo.AlgoTestBase;
 import org.neo4j.graphalgo.StoreLoaderBuilder;
 import org.neo4j.graphalgo.api.Graph;
+import org.neo4j.graphalgo.beta.pregel.ImmutablePregelConfig;
 import org.neo4j.graphalgo.beta.pregel.Pregel;
 import org.neo4j.graphalgo.beta.pregel.PregelConfig;
-import org.neo4j.graphalgo.config.AlgoBaseConfig;
 import org.neo4j.graphalgo.core.concurrency.Pools;
 import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
 import org.neo4j.graphalgo.core.utils.paged.HugeDoubleArray;
@@ -74,7 +72,7 @@ void runK1Coloring() {
         int batchSize = 10;
         int maxIterations = 10;
 
-        PregelConfig config = new PregelConfig.Builder()
+        PregelConfig config = ImmutablePregelConfig.builder()
             .isAsynchronous(true)
             .build();
 
@@ -83,7 +81,6 @@ void runK1Coloring() {
             config,
             new K1ColoringExample(),
             batchSize,
-            AlgoBaseConfig.DEFAULT_CONCURRENCY,
             Pools.DEFAULT,
             AllocationTracker.EMPTY
         );