bezza/BE-Graphe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changements mineurs

Browse source
This commit is contained in:
bezza 2025-05-26 19:08:17 +02:00
parent 8f4633fde0
commit 8d327ba36f
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/ProblemeOuvert.java
View file

@ -118,7 +118,7 @@ import org.insa.graphs.model.Graph;
import org.insa.graphs.model.Node; import org.insa.graphs.model.Node;
import org.insa.graphs.model.Path; import org.insa.graphs.model.Path;
import org.insa.graphs.model.RoadInformation.RoadType; import org.insa.graphs.model.RoadInformation.RoadType;
//import org.insa.graphs.algorithm.shortestpath.ProblemeOuvert;
public class ProblemeOuvert extends DijkstraAlgorithm { public class ProblemeOuvert extends DijkstraAlgorithm {

17
be-graphes-gui/src/test/java/TestDijkstra.java
View file

@ -19,6 +19,7 @@ import org.insa.graphs.algorithm.shortestpath.ShortestPathData;
import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution; import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution;
import org.insa.graphs.gui.drawing.Drawing; import org.insa.graphs.gui.drawing.Drawing;
import org.insa.graphs.gui.drawing.components.BasicDrawing; import org.insa.graphs.gui.drawing.components.BasicDrawing;
import org.insa.graphs.gui.simple.Launch;
import org.insa.graphs.model.Graph; import org.insa.graphs.model.Graph;
import org.insa.graphs.model.Node; import org.insa.graphs.model.Node;
import org.insa.graphs.model.Path; import org.insa.graphs.model.Path;
@ -118,12 +119,16 @@ public class TestDijkstra {
coutPath = pathFromNodes.getLength(); coutPath = pathFromNodes.getLength();
} }
if (type == 1) { switch (type) {
System.out.println("Coût DijkstraAstar: " + coutAlgo); case 1:
} else if (type == 2) { System.out.println("Coût DijkstraAstar: " + coutAlgo);
System.out.println("Coût ProblemeOuvert: " + coutAlgo); break;
} else { case 2:
System.out.println("Coût Dijkstra: " + coutAlgo); System.out.println("Coût ProblemeOuvert: " + coutAlgo);
break;
default:
System.out.println("Coût Dijkstra: " + coutAlgo);
break;
} }
boolean coutOk = Math.abs(coutAlgo - coutPath) < 1e-6; // pour comparer des réels boolean coutOk = Math.abs(coutAlgo - coutPath) < 1e-6; // pour comparer des réels