Fix Traversal Print. It was wrongly using the successor array and now…

… uses a correct list
LeonardoTPereira · Jun 28, 2021 · 47e6f35 · 47e6f35
1 parent 5966d76
commit 47e6f35
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,6 +28,12 @@
             <artifactId>svg-salamander</artifactId>
             <version>1.1.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
 
 
     </dependencies>
@@ -39,5 +45,8 @@
         <sonar.projectKey>LeonardoTPereira_Graphs</sonar.projectKey>
         <sonar.organization>leonardotpereira</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <sonar.coverage.jacoco.xmlReportPaths>CoverageReport
+        </sonar.coverage.jacoco.xmlReportPaths>
     </properties>
-</project>
+</project>
+
diff --git a/src/main/java/graph/BreadthFirstTraversal.java b/src/main/java/graph/BreadthFirstTraversal.java
@@ -15,6 +15,7 @@ public BreadthFirstTraversal(AbstractGraph graph)
     public void traverseGraph(Vertex source)
     {
         int sourceIndex = getGraph().getVertices().indexOf(source);
+        addToPath(source);
         markVertexAsVisited(sourceIndex);
         setDistanceToVertex(sourceIndex, 0);
         setPredecessorVertexIndex(sourceIndex, -1);
@@ -43,7 +44,7 @@ public void traverseGraph(Vertex source)
                 }
             }
         }
-        printPath(sourceIndex);
+        printPath();
         printShortestPath(source, getGraph().getVertices().get(getGraph().getVertices().size()-1));
     }
 
@@ -53,6 +54,7 @@ private void updateTraversalInfoForVertex(int newVertexIndex, int previousVertex
         var oldVertex = getGraph().getVertices().get(previousVertexIndex);
         float newDistance = getGraph().getDistance(oldVertex, newVertex);
         float distance = getDistanceToVertex(previousVertexIndex) + newDistance;
+        addToPath(newVertex);
         markVertexAsVisited(newVertexIndex);
         setDistanceToVertex(newVertexIndex,  distance);
         setPredecessorVertexIndex(newVertexIndex, previousVertexIndex);

diff --git a/src/main/java/graph/GraphController.java b/src/main/java/graph/GraphController.java
@@ -85,6 +85,6 @@ private void createTest()
         g.addEdge(g.getVertices().get(5), g.getVertices().get(6), 1);
         g.addEdge(g.getVertices().get(5), g.getVertices().get(0), 3);
 
-        traversalStrategy = new FloydWarshallTraversal(g);
+        traversalStrategy = new BreadthFirstTraversal(g);
     }
 }
diff --git a/src/main/java/graph/TraversalStrategyInterface.java b/src/main/java/graph/TraversalStrategyInterface.java
@@ -1,6 +1,8 @@
 package graph;
 
 import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.logging.Logger;
 
 public abstract class TraversalStrategyInterface
@@ -11,6 +13,7 @@ public abstract class TraversalStrategyInterface
     private float[] distanceToVertices;
     private int[] predecessorVertexIndices;
     private int[] successorVertexIndices;
+    private List<Vertex> traversalPath;
 
     public void markVertexAsVisited(int vertexIndex)
     {
@@ -63,6 +66,7 @@ protected TraversalStrategyInterface(AbstractGraph graph)
         Arrays.fill(predecessorVertexIndices, -1);
         successorVertexIndices = new int[graph.getNumberOfVertices()];
         Arrays.fill(successorVertexIndices, -1);
+        traversalPath = new LinkedList<>();
     }
 
     abstract void traverseGraph(Vertex source);
@@ -77,18 +81,16 @@ public void setGraph(AbstractGraph graph)
         this.graph = graph;
     }
 
-    protected void printPath(int sourceIndex)
+    protected void printPath()
     {
         var visitedPath = new StringBuilder();
-        int currentIndex = sourceIndex;
-        do
+        for (Vertex vertex : traversalPath)
         {
-            visitedPath.append(getGraph().getVertices().get(currentIndex)).append(' ').
-                    append("Distance: ").append(getDistanceToVertex(currentIndex)).append(' ');
-            currentIndex = getSuccessorVertexIndex(currentIndex);
-        }while(currentIndex > 0);
-        var traversalPath = "\n"+ visitedPath +"\n";
-        LOGGER.info(traversalPath);
+            visitedPath.append(vertex).append(' ').
+                    append("Distance: ").append(getDistanceToVertex(getGraph().getVertices().indexOf(vertex))).append(' ');
+        }
+        var traversalPathString = "\n"+ visitedPath +"\n";
+        LOGGER.info(traversalPathString);
     }
 
     protected void printShortestPath(Vertex source, Vertex destination)
@@ -103,8 +105,8 @@ protected void printShortestPath(Vertex source, Vertex destination)
             currentIndex = getPredecessorVertexIndex(currentIndex);
         }while(currentIndex != sourceIndex);
         shortestPath.append(graph.getVertices().get(currentIndex));
-        var traversalPath = "\n"+ shortestPath +"\n";
-        LOGGER.info(traversalPath);
+        var shortestPathString = "\n"+ shortestPath +"\n";
+        LOGGER.info(shortestPathString);
     }
 
     protected void printDistances()
@@ -117,4 +119,9 @@ protected void printDistances()
         var finalString = distanceString.toString();
         LOGGER.info(finalString);
     }
+
+    public void addToPath(Vertex vertex)
+    {
+        traversalPath.add(vertex);
+    }
 }