Bring back orientation for RelationshipsBuilder

- also fix some tests

Author: DarthMax

algo/src/main/java/org/neo4j/gds/beta/walking/CollapsePath.java

@@ -20,9 +20,9 @@
 package org.neo4j.gds.beta.walking;
 
 import org.neo4j.gds.Algorithm;
+import org.neo4j.gds.Orientation;
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.api.Relationships;
-import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.core.Aggregation;
 import org.neo4j.gds.core.concurrency.ParallelUtil;
 import org.neo4j.gds.core.concurrency.RunWithConcurrency;
@@ -64,7 +64,7 @@ public CollapsePath(
     public Relationships compute() {
         RelationshipsBuilder relImporter = GraphFactory.initRelationshipsBuilder()
             .nodes(pathTemplates.get(0)[0]) // just need any arbitrary graph
-            .direction(Direction.DIRECTED)
+            .orientation(Orientation.NATURAL)
             .aggregation(Aggregation.NONE)
             .concurrency(concurrency)
             .executorService(executorService)

algo/src/main/java/org/neo4j/gds/leiden/GraphAggregationPhase.java

@@ -148,7 +148,7 @@ Graph run() {
         IdMap idMap = nodesBuilder.build().idMap();
         RelationshipsBuilder relationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(idMap)
-            .direction(direction)
+            .orientation(direction.toOrientation())
             .addPropertyConfig(Aggregation.SUM, DefaultValue.forDouble())
             .executorService(executorService)
             .build();

algo/src/main/java/org/neo4j/gds/louvain/Louvain.java

@@ -237,7 +237,7 @@ private Graph summarizeGraph(
         IdMap idMap = nodesBuilder.build().idMap();
         RelationshipsBuilder relationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(idMap)
-            .direction(rootGraph.schema().direction())
+            .orientation(rootGraph.schema().direction().toOrientation())
             .addPropertyConfig(Aggregation.SUM, DefaultValue.forDouble())
             .executorService(executorService)
             .build();

algo/src/main/java/org/neo4j/gds/similarity/SimilarityGraphBuilder.java

@@ -19,10 +19,10 @@
  */
 package org.neo4j.gds.similarity;
 
+import org.neo4j.gds.Orientation;
 import org.neo4j.gds.api.DefaultValue;
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.api.IdMap;
-import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.core.Aggregation;
 import org.neo4j.gds.core.compress.AdjacencyListBehavior;
 import org.neo4j.gds.core.concurrency.ParallelUtil;
@@ -86,7 +86,7 @@ public SimilarityGraphBuilder(
     public Graph build(Stream<SimilarityResult> stream) {
         var relationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(idMap.rootIdMap())
-            .direction(Direction.DIRECTED)
+            .orientation(Orientation.NATURAL)
             .addPropertyConfig(Aggregation.NONE, DefaultValue.forDouble())
             .concurrency(concurrency)
             .executorService(executorService)

algo/src/test/java/org/neo4j/gds/beta/k1coloring/K1ColoringTest.java

@@ -33,13 +33,11 @@
 import org.neo4j.gds.core.GraphDimensions;
 import org.neo4j.gds.core.ImmutableGraphDimensions;
 import org.neo4j.gds.core.concurrency.Pools;
-import org.neo4j.gds.core.huge.UnionGraph;
 import org.neo4j.gds.core.utils.mem.MemoryRange;
 import org.neo4j.gds.core.utils.paged.HugeLongArray;
 import org.neo4j.gds.core.utils.progress.EmptyTaskRegistryFactory;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -92,26 +90,16 @@ void testK1Coloring() {
     void testParallelK1Coloring() {
         long seed = 42L;
 
-        RandomGraphGenerator outGenerator = RandomGraphGenerator.builder()
-            .nodeCount(100_000)
-            .averageDegree(5)
-            .relationshipDistribution(RelationshipDistribution.POWER_LAW)
-            .seed(seed)
-            .build();
-
-        RandomGraphGenerator inGenerator = RandomGraphGenerator.builder()
-            .nodeCount(100_000)
-            .averageDegree(5)
+        var graph = RandomGraphGenerator.builder()
+            .nodeCount(200_000)
+            .averageDegree(10)
             .relationshipDistribution(RelationshipDistribution.POWER_LAW)
             .seed(seed)
             .aggregation(Aggregation.NONE)
-            .direction(Direction.DIRECTED)
+            .direction(Direction.UNDIRECTED)
             .allowSelfLoops(AllowSelfLoops.NO)
-            .build();
-
-        var naturalGraph = outGenerator.generate();
-        var reverseGraph = inGenerator.generate();
-        var graph = UnionGraph.of(Arrays.asList(naturalGraph, reverseGraph));
+            .build()
+            .generate();
 
         K1Coloring k1Coloring = new K1Coloring(
             graph,

algo/src/test/java/org/neo4j/gds/embeddings/fastrp/FastRPTest.java

@@ -25,13 +25,13 @@
 import org.junit.jupiter.api.Test;
 import org.neo4j.gds.BaseTest;
 import org.neo4j.gds.NodeLabel;
+import org.neo4j.gds.Orientation;
 import org.neo4j.gds.PropertyMapping;
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.StoreLoaderBuilder;
 import org.neo4j.gds.api.DefaultValue;
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.api.GraphStore;
-import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.collections.HugeSparseLongArray;
 import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.compat.TestLog;
@@ -641,7 +641,7 @@ void shouldBeDeterministicGivenSameOriginalIds() {
         );
         RelationshipsBuilder firstRelationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(firstIdMap)
-            .direction(Direction.UNDIRECTED)
+            .orientation(Orientation.UNDIRECTED)
             .executorService(Pools.DEFAULT)
             .build();
 
@@ -664,7 +664,7 @@ void shouldBeDeterministicGivenSameOriginalIds() {
         );
         RelationshipsBuilder secondRelationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(secondIdMap)
-            .direction(Direction.UNDIRECTED)
+            .orientation(Orientation.UNDIRECTED)
             .executorService(Pools.DEFAULT)
             .build();
 

algo/src/test/java/org/neo4j/gds/embeddings/node2vec/Node2VecTest.java

@@ -34,11 +34,11 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.BaseTest;
 import org.neo4j.gds.NodeLabel;
+import org.neo4j.gds.Orientation;
 import org.neo4j.gds.PropertyMapping;
 import org.neo4j.gds.StoreLoaderBuilder;
 import org.neo4j.gds.TestProgressTracker;
 import org.neo4j.gds.api.Graph;
-import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.collections.HugeSparseLongArray;
 import org.neo4j.gds.compat.Neo4jProxy;
 import org.neo4j.gds.compat.TestLog;
@@ -277,7 +277,7 @@ void shouldBeFairlyConsistentUnderOriginalIds(EmbeddingInitializer embeddingInit
         );
         RelationshipsBuilder firstRelationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(firstIdMap)
-            .direction(Direction.UNDIRECTED)
+            .orientation(Orientation.UNDIRECTED)
             .executorService(Pools.DEFAULT)
             .build();
 
@@ -298,7 +298,7 @@ void shouldBeFairlyConsistentUnderOriginalIds(EmbeddingInitializer embeddingInit
         );
         RelationshipsBuilder secondRelationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(secondIdMap)
-            .direction(Direction.UNDIRECTED)
+            .orientation(Orientation.UNDIRECTED)
             .executorService(Pools.DEFAULT)
             .build();
 

core/src/main/java/org/neo4j/gds/beta/generator/RandomGraphGenerator.java

@@ -124,7 +124,7 @@ public HugeGraph generate() {
 
         var relationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(idMap)
-            .direction(direction)
+            .orientation(direction.toOrientation())
             .addAllPropertyConfigs(maybeRelationshipPropertyProducer.isPresent()
                 ? List.of(GraphFactory.PropertyConfig.of(aggregation, DefaultValue.forDouble()))
                 : List.of()

core/src/main/java/org/neo4j/gds/core/loading/CypherRelationshipLoader.java

@@ -30,7 +30,6 @@
 import org.neo4j.gds.RelationshipType;
 import org.neo4j.gds.api.GraphLoaderContext;
 import org.neo4j.gds.api.IdMap;
-import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.config.GraphProjectFromCypherConfig;
 import org.neo4j.gds.core.Aggregation;
 import org.neo4j.gds.core.loading.construction.GraphFactory;
@@ -178,7 +177,7 @@ private RelationshipsBuilder createRelationshipsBuilder(RelationshipType relatio
                 .nodes(idMap)
                 .concurrency(cypherConfig.readConcurrency())
                 .propertyConfigs(propertyConfigs)
-                .direction(Direction.DIRECTED)
+                .orientation(Orientation.NATURAL)
                 .validateRelationships(cypherConfig.validateRelationships())
                 .build();
         }

core/src/main/java/org/neo4j/gds/core/loading/construction/GraphFactory.java

@@ -202,7 +202,7 @@ public static RelationshipsBuilderBuilder initRelationshipsBuilder() {
     @Builder.Factory
     static RelationshipsBuilder relationshipsBuilder(
         PartialIdMap nodes,
-        Optional<Direction> direction,
+        Optional<Orientation> orientation,
         List<PropertyConfig> propertyConfigs,
         Optional<Aggregation> aggregation,
         Optional<Boolean> validateRelationships,
@@ -221,11 +221,11 @@ static RelationshipsBuilder relationshipsBuilder(
         var relationshipType = RelationshipType.ALL_RELATIONSHIPS;
         var isMultiGraph = Arrays.stream(aggregations).allMatch(Aggregation::equivalentToNone);
 
-        var actualDirection = direction.orElse(Direction.DIRECTED);
+        var actualOrientation = orientation.orElse(Orientation.NATURAL);
         var projectionBuilder = RelationshipProjection
             .builder()
             .type(relationshipType.name())
-            .orientation(actualDirection == Direction.UNDIRECTED ? Orientation.UNDIRECTED : Orientation.NATURAL);
+            .orientation(actualOrientation);
 
         propertyConfigs.forEach(propertyConfig -> projectionBuilder.addProperty(
             GraphFactory.DUMMY_PROPERTY,
@@ -272,7 +272,7 @@ static RelationshipsBuilder relationshipsBuilder(
 
         return new RelationshipsBuilder(
             nodes,
-            actualDirection,
+            Direction.fromOrientation(actualOrientation),
             bufferSize,
             propertyKeyIds,
             importerFactory,