minors

Author: IoannisPanagiotas

algo/src/main/java/org/neo4j/gds/pricesteiner/GrowthPhase.java

@@ -96,7 +96,7 @@ GrowthResult grow() {
                     continue;
                 }
 
-                clusterStructure.sumOnEdgePart(u,moat,clusterMoatPairOfu);
+                 clusterStructure.sumOnEdgePart(u,moat,clusterMoatPairOfu);
                  clusterStructure.sumOnEdgePart(v,moat,clusterMoatPairOfv);
 
                 var uCluster = clusterMoatPairOfu.cluster();
@@ -164,9 +164,10 @@ private void initializeEdgeParts() {
                     edgeCosts.set(edgeId, w);
                     edgeParts.set(2 * edgeId, s);
                     edgeParts.set(2 * edgeId + 1, t);
-                    edgeEventsQueue.addBothWays(s, t, edgePart1, edgePart2, w / 2);
+                    edgeEventsQueue.addBothWays(s, t, edgePart1, edgePart2, w / 2.0);
+                    return true;
                 }
-                return  s > t;
+                return false;
             });
             progressTracker.logProgress(graph.degree(u));
         }
@@ -177,7 +178,7 @@ private void initializeClusterPrizes() {
         for (long u = 0; u < graph.nodeCount(); ++u) {
             double prize = prizes.applyAsDouble(u);
             clusterStructure.setClusterPrize(u, prize);
-            clusterEventsPriorityQueue.add(u, clusterStructure.tightnessTime(u, 0));
+            clusterEventsPriorityQueue.add(u, prize);
         }
     }
 
@@ -197,13 +198,13 @@ private void mergeClusters(
             edgeEventsQueue.increaseValuesOnInactiveCluster(cluster2, moat - clusterStructure.inactiveSince(cluster2));
         }
 
-        var newCluster = clusterStructure.merge(cluster1, cluster2,moat);
+        var newCluster = clusterStructure.merge(cluster1, cluster2, moat);
 
         edgeEventsQueue.mergeAndUpdate(newCluster, cluster1, cluster2);
         clusterEventsPriorityQueue.add(newCluster, clusterStructure.tightnessTime(newCluster, moat));
 
         addToTree(edgeId);
-        edgeParts.set(2*edgeId,-edgeParts.get(2*edgeId));
+        edgeParts.set(2*edgeId, -edgeParts.get(2*edgeId)); //signal that edge id has been used
         edgeParts.set(2*edgeId+1,-edgeParts.get(2*edgeId+1));
     }
 

algo/src/main/java/org/neo4j/gds/pricesteiner/StrongPruning.java

@@ -79,7 +79,6 @@ void performPruning(){
                 }
             }
 
-
             while (currentPos < totalPos) {
                 terminationFlag.assertRunning();;
                 var nextLeaf = queue.get(currentPos++);
@@ -145,8 +144,8 @@ PrizeSteinerTreeResult resultTree(){
     private void pruneSubtree(long node, HugeLongArray helpingArray,HugeLongArray parents){
         terminationFlag.assertRunning();
         var tree = treeStructure.tree();
-        long currentPosition= 0;
-        MutableLong position=new MutableLong();
+        long currentPosition = 0;
+        MutableLong position = new MutableLong();
         helpingArray.set(position.getAndIncrement(),node);
 
         while (currentPosition < position.get()){

algo/src/main/java/org/neo4j/gds/pricesteiner/TreeProducer.java

@@ -24,7 +24,6 @@
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.api.IdMap;
 import org.neo4j.gds.collections.ha.HugeLongArray;
-import org.neo4j.gds.core.Aggregation;
 import org.neo4j.gds.core.loading.construction.GraphFactory;
 import org.neo4j.gds.core.loading.construction.RelationshipsBuilder;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
@@ -49,11 +48,10 @@ static TreeStructure createTree(GrowthResult growthResult,long nodeCount, IdMap
 
         RelationshipsBuilder relationshipsBuilder = GraphFactory.initRelationshipsBuilder()
             .nodes(idMap)
-            .relationshipType(RelationshipType.of("_IGNORED_"))
+            .relationshipType(RelationshipType.of("TREE"))
             .orientation(Orientation.UNDIRECTED)
             .addPropertyConfig(GraphFactory.PropertyConfig.builder()
-                .propertyKey("property")
-                .aggregation(Aggregation.SUM)
+                .propertyKey("weight")
                 .build())
             .build();
 
@@ -71,11 +69,9 @@ static TreeStructure createTree(GrowthResult growthResult,long nodeCount, IdMap
         var singleTypeRelationships= relationshipsBuilder.build();
         var tree = GraphFactory.create(idMap, singleTypeRelationships);
 
-
         progressTracker.endSubTask("Tree Creation");
         return new TreeStructure(tree,degree,  idMap.nodeCount());
 
-
     }
 
 }