diff --git a/Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java b/Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java index 74b4e5190725a9439e9924f37901f075c4a0e10e..8aa08938c4d9d28f7504b3996c5cb7f7273b4290 100644 --- a/Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java +++ b/Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java @@ -73,8 +73,7 @@ public class TestGraph { void testForesta() { GraphInterface grafo = new UndirectedGraph("5; 0 3; 0 4; 3 4; 1 2;"); DFS dfsTest = new DFS(grafo); - for (GraphInterface g : dfsTest.visitaDFSCompleta()) { - System.out.println(g); - } + GraphInterface forest = dfsTest.getForest(); + Assertions.assertFalse(forest.hasEdge(0,1) || forest.hasEdge(3,1) || forest.hasEdge(4, 1) || forest.hasEdge(0,2) || forest.hasEdge(3,2) || forest.hasEdge(4, 2)); } } diff --git a/Algoritmi_2/Laboratorio/Lab3/src/DFS.java b/Algoritmi_2/Laboratorio/Lab3/src/DFS.java index 911ccbee757a458692f2d196539099c46e42e5b7..7eccb29d3ca0bdb71299259bfb6bb9b51d5797c4 100644 --- a/Algoritmi_2/Laboratorio/Lab3/src/DFS.java +++ b/Algoritmi_2/Laboratorio/Lab3/src/DFS.java @@ -41,13 +41,12 @@ public class DFS { return this.treeDFS; } - public ArrayList<GraphInterface> visitaDFSCompleta() { - ArrayList<GraphInterface> returnArray = new ArrayList<>(); + public GraphInterface getForest() { for (int nodo = 0; nodo < this.myGraph.getOrder(); nodo++) { if (!this.scoperti[nodo]) { - returnArray.add(getTree(nodo)); + getTree(nodo); } } - return returnArray; + return this.treeDFS; } }