From 5fc365397ab6511b71268746b47e65a8c43f9632 Mon Sep 17 00:00:00 2001
From: Gianluca <gianlucamastrolonardo10@gmail.com>
Date: Wed, 27 Mar 2024 15:13:32 +0100
Subject: [PATCH] es finito
---
Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java | 5 ++---
Algoritmi_2/Laboratorio/Lab3/src/DFS.java | 7 +++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java b/Algoritmi_2/Laboratorio/Lab3/TestGraph/TestGraph.java
index 74b4e51..8aa0893 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 911ccbe..7eccb29 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;
}
}
--
GitLab