Merge pull request #998 from vnickolov/triangle-count-fix-stream

Remove `localClusteringCoefficient` from TriangleCount stream

Author: vnickolov

alpha/alpha-proc/src/test/java/org/neo4j/graphalgo/triangle/TriangleDocTest.java

@@ -133,20 +133,20 @@ void shouldStreamTriangleCount() {
                        "   }," +
                        "   concurrency: 4" +
                        " })" +
-                       " YIELD nodeId, triangles, localClusteringCoefficient" +
-                       " RETURN gds.util.asNode(nodeId).name AS name, triangles, localClusteringCoefficient AS coefficient" +
-                       " ORDER BY coefficient DESC";
-
-        String expected = "+--------------------------------------------+" + NL +
-                          "| name      | triangles | coefficient        |" + NL +
-                          "+--------------------------------------------+" + NL +
-                          "| \"Karin\"   | 1         | 1.0                |" + NL +
-                          "| \"Mark\"    | 1         | 1.0                |" + NL +
-                          "| \"Chris\"   | 2         | 0.6666666666666666 |" + NL +
-                          "| \"Will\"    | 2         | 0.6666666666666666 |" + NL +
-                          "| \"Michael\" | 3         | 0.3                |" + NL +
-                          "| \"Alice\"   | 0         | 0.0                |" + NL +
-                          "+--------------------------------------------+" + NL +
+                       " YIELD nodeId, triangles" +
+                       " RETURN gds.util.asNode(nodeId).name AS name, triangles" +
+                       " ORDER BY triangles ASC";
+
+        String expected = "+-----------------------+" + NL +
+                          "| name      | triangles |" + NL +
+                          "+-----------------------+" + NL +
+                          "| \"Alice\"   | 0         |" + NL +
+                          "| \"Karin\"   | 1         |" + NL +
+                          "| \"Mark\"    | 1         |" + NL +
+                          "| \"Chris\"   | 2         |" + NL +
+                          "| \"Will\"    | 2         |" + NL +
+                          "| \"Michael\" | 3         |" + NL +
+                          "+-----------------------+" + NL +
                           "6 rows" + NL;
 
         String actual = runQuery(query, Result::resultAsString);

proc/community/src/main/java/org/neo4j/graphalgo/triangle/TriangleCountStreamProc.java

@@ -75,8 +75,7 @@ protected Stream<Result> stream(ComputationResult<IntersectingTriangleCount, Tri
         return LongStream.range(0, graph.nodeCount())
             .mapToObj(i -> new Result(
                 graph.toOriginalNodeId(i),
-                result.localTriangles().get(i),
-                result.localClusteringCoefficients().get(i)
+                result.localTriangles().get(i)
             ));
     }
 
@@ -118,12 +117,10 @@ public static class Result {
 
         public final long nodeId;
         public final long triangles;
-        public final double localClusteringCoefficient;
 
-        public Result(long nodeId, long triangles, double localClusteringCoefficient) {
+        public Result(long nodeId, long triangles) {
             this.nodeId = nodeId;
             this.triangles = triangles;
-            this.localClusteringCoefficient = localClusteringCoefficient;
         }
     }
 }

proc/community/src/test/java/org/neo4j/graphalgo/triangle/TriangleCountStreamProcTest.java

@@ -38,7 +38,6 @@ void testStreaming() {
         var rowCount = new AtomicInteger();
         runQueryWithRowConsumer(query, row -> {
             assertEquals(1L, row.getNumber("triangles"));
-            assertEquals(1.0, row.getNumber("localClusteringCoefficient"));
             rowCount.incrementAndGet();
         });