From 2c028de7d28d397a4e525ccf351bd1df6e559283 Mon Sep 17 00:00:00 2001
From: 20050114 <20050114@studenti.uniupo.it>
Date: Fri, 19 Apr 2024 13:02:54 +0200
Subject: [PATCH] fix es3
---
.../Laboratorio/Lab4/Test/TestGraph.java | 13 ++++
.../Laboratorio/Lab4/src/BFSAndDFSApp.java | 64 +++++++++++++------
2 files changed, 59 insertions(+), 18 deletions(-)
diff --git a/Algoritmi_2/Laboratorio/Lab4/Test/TestGraph.java b/Algoritmi_2/Laboratorio/Lab4/Test/TestGraph.java
index b6f8867..317ecc8 100644
--- a/Algoritmi_2/Laboratorio/Lab4/Test/TestGraph.java
+++ b/Algoritmi_2/Laboratorio/Lab4/Test/TestGraph.java
@@ -1,9 +1,11 @@
import it.uniupo.graphLib.DirectedGraph;
+import it.uniupo.graphLib.Edge;
import it.uniupo.graphLib.GraphInterface;
import it.uniupo.graphLib.UndirectedGraph;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import java.security.interfaces.EdECKey;
import java.util.ArrayList;
import java.util.Arrays;
@@ -65,4 +67,15 @@ public class TestGraph {
testApp = new BFSAndDFSApp(g);
Assertions.assertTrue(testApp.hasDirCycle());
}
+
+ @Test
+ void testgetShortestPath() {
+ DirectedGraph g = new DirectedGraph("5; 3 4; 4 2; 2 3; 4 1; 1 2; 1 0");
+ BFSAndDFSApp testApp = new BFSAndDFSApp(g);
+ ArrayList<Edge> path = testApp.getShortestPath(4, 0);
+ Assertions.assertTrue(path.contains(new Edge(4, 1)));
+ Assertions.assertTrue(path.contains(new Edge(1, 0)));
+ ArrayList<Edge> path2 = testApp.getShortestPath(0, 4);
+ Assertions.assertTrue(path2.isEmpty());
+ }
}
diff --git a/Algoritmi_2/Laboratorio/Lab4/src/BFSAndDFSApp.java b/Algoritmi_2/Laboratorio/Lab4/src/BFSAndDFSApp.java
index 73d6498..b5b091d 100644
--- a/Algoritmi_2/Laboratorio/Lab4/src/BFSAndDFSApp.java
+++ b/Algoritmi_2/Laboratorio/Lab4/src/BFSAndDFSApp.java
@@ -1,8 +1,8 @@
+import it.uniupo.graphLib.Edge;
import it.uniupo.graphLib.GraphInterface;
import it.uniupo.graphLib.UndirectedGraph;
-import java.util.Arrays;
-import java.util.ArrayList;
+import java.util.*;
public
class BFSAndDFSApp {
@@ -14,8 +14,7 @@ class BFSAndDFSApp {
private int[] fathers;
GraphInterface treeDFS;
- public
- BFSAndDFSApp(GraphInterface g) {
+ public BFSAndDFSApp(GraphInterface g) {
myGraph = g;
BFS bfs = new BFS(g);
DFS dfs = new DFS(g);
@@ -25,8 +24,7 @@ class BFSAndDFSApp {
Arrays.fill(this.fathers, -1);
}
- private
- boolean visitaDFS(int sorg) {
+ private boolean visitaDFS(int sorg) {
if (sorg >= this.myGraph.getOrder() || sorg < 0) {
throw new IllegalArgumentException("Sorgente non presenten nel grafo");
}
@@ -43,8 +41,24 @@ class BFSAndDFSApp {
return false;
}
- public
- boolean hasUndirectedCycle() {
+ private void visitaBFS(int sorg) {
+ scoperti[sorg] = true;
+ Queue<Integer> q = new LinkedList<>();
+ q.add(sorg);
+ while (!q.isEmpty()) {
+ int node = q.remove();
+ for (Integer neighbour : this.myGraph.getNeighbors(node)) {
+ if (!scoperti[neighbour]) {
+ scoperti[neighbour] = true;
+ q.add(neighbour);
+ fathers[neighbour] = node;
+ }
+ }
+ }
+ }
+
+
+ public boolean hasUndirectedCycle() {
for (int nodo = 0; nodo < this.myGraph.getOrder(); nodo++) {
if (visitaDFS(nodo)) {
return true;
@@ -53,8 +67,7 @@ class BFSAndDFSApp {
return false;
}
- private
- void visitaDFSPostVisit(int sorg, ArrayList<Integer> orderPostVisit) {
+ private void visitaDFSPostVisit(int sorg, ArrayList<Integer> orderPostVisit) {
if (sorg >= this.myGraph.getOrder() || sorg < 0) {
throw new IllegalArgumentException("Sorgente non presenten nel grafo");
}
@@ -67,33 +80,33 @@ class BFSAndDFSApp {
orderPostVisit.add(sorg);
}
- public
- ArrayList<Integer> getNodesInOrderPostVisit(int sorg) {
+ public ArrayList<Integer> getNodesInOrderPostVisit(int sorg) {
ArrayList<Integer> orderPostVisit = new ArrayList<>();
visitaDFSPostVisit(sorg, orderPostVisit);
return orderPostVisit;
}
- private
- boolean hasDirCycleImpl(int sorg) {
+ private boolean hasDirCycleImpl(int sorg) {
scoperti[sorg] = true;
for (Integer node : myGraph.getNeighbors(sorg)) {
if (!scoperti[node]) {
fathers[node] = sorg;
- return hasDirCycleImpl(node);
- } else if (node != fathers[sorg]) {
+ if (hasDirCycleImpl(node)) {
+ return true;
+ }
+ } else if (fathers[sorg] != -1 && node != fathers[sorg]) {
return true;
}
}
return false;
}
- public
- boolean hasDirCycle() {
+ public boolean hasDirCycle() {
if (myGraph instanceof UndirectedGraph) {
throw new IllegalArgumentException("Impossibile usare hasDirCycle su un grafo non orientato");
}
for (int i = 0; i < myGraph.getOrder(); i++) {
+ System.out.println("pup!");
fathers = new int[myGraph.getOrder()];
Arrays.fill(fathers, -1);
scoperti = new boolean[myGraph.getOrder()];
@@ -104,4 +117,19 @@ class BFSAndDFSApp {
}
return false;
}
+
+
+ public ArrayList<Edge> getShortestPath(int sorg, int dest) {
+ ArrayList<Edge> path = new ArrayList<>();
+ visitaBFS(sorg);
+ int tmp = dest;
+ while (fathers[tmp] != -1) {
+ int x = tmp;
+ tmp = fathers[tmp];
+ path.add(new Edge(tmp, x));
+ }
+ //path.add(new Edge(sorg, tmp));
+ Collections.reverse(path);
+ return path;
+ }
}
\ No newline at end of file
--
GitLab