Reduce unneeded bitset creation

constellation-app · Feb 26, 2025 · aae5461 · aae5461
1 parent ae9ad76
commit aae5461
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../au/gov/asd/tac/constellation/plugins/algorithms/sna/centrality/PathScoringUtilities.java b/.../au/gov/asd/tac/constellation/plugins/algorithms/sna/centrality/PathScoringUtilities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2024 Australian Signals Directorate
+ * Copyright 2010-2025 Australian Signals Directorate
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -410,7 +410,7 @@ private static Tuple<BitSet[], float[]> computeAllPathsDirected(final GraphReadM
     protected static Tuple<BitSet[], float[]> computeShortestPathsUndirected(final GraphReadMethods graph, final ScoreType scoreType, final boolean selectedOnly) {
         final int vertexCount = graph.getVertexCount();
         final BitSet[] traversal = new BitSet[vertexCount];
-        final float[] scores = new float[vertexCount];
+        final float[] scores = new float[vertexCount]; // Array initialised with 0's
 
         final BitSet update = new BitSet(vertexCount);
         final BitSet[] sendFails = new BitSet[vertexCount];
@@ -421,12 +421,12 @@ protected static Tuple<BitSet[], float[]> computeShortestPathsUndirected(final G
 
         // initialise variables
         for (int vertexPosition = 0; vertexPosition < vertexCount; vertexPosition++) {
-            traversal[vertexPosition] = new BitSet(vertexCount);
-            scores[vertexPosition] = 0;
 
             // only update nodes with neighbours
             final int vxId = graph.getVertex(vertexPosition);
             if (graph.getVertexNeighbourCount(vxId) > 0) {
+                traversal[vertexPosition] = new BitSet(vertexCount);
+
                 update.set(vertexPosition);
 
                 sendFails[vertexPosition] = new BitSet(vertexCount);

diff --git a/...v/asd/tac/constellation/plugins/algorithms/sna/centrality/PathScoringUtilitiesNGTest.java b/...v/asd/tac/constellation/plugins/algorithms/sna/centrality/PathScoringUtilitiesNGTest.java
@@ -81,7 +81,7 @@ public void testComputeShortestPathsUndirected() {
 
         // Set up expected expected bit set array
         final BitSet expectedBitSetA = BitSet.valueOf(new long[]{0b11011});
-        final BitSet expectedBitSetB = BitSet.valueOf(new long[]{0b00000});
+        final BitSet expectedBitSetB = null;
         final BitSet[] expectedBitSets = {expectedBitSetA, expectedBitSetA, expectedBitSetB, expectedBitSetA, expectedBitSetA};
         // Set up expected float array
         final float[] expectedFloats = {2.0F, 2.0F, 0.0F, 2.0F, 2.0F};