From 8d327ba36f34e42f8afe2664b09e35a12c13085e Mon Sep 17 00:00:00 2001 From: bezza Date: Mon, 26 May 2025 19:08:17 +0200 Subject: [PATCH] changements mineurs --- .../algorithm/shortestpath/ProblemeOuvert.java | 2 +- be-graphes-gui/src/test/java/TestDijkstra.java | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/ProblemeOuvert.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/ProblemeOuvert.java index d66b785..9138fac 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/ProblemeOuvert.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/ProblemeOuvert.java @@ -118,7 +118,7 @@ import org.insa.graphs.model.Graph; import org.insa.graphs.model.Node; import org.insa.graphs.model.Path; import org.insa.graphs.model.RoadInformation.RoadType; -//import org.insa.graphs.algorithm.shortestpath.ProblemeOuvert; + public class ProblemeOuvert extends DijkstraAlgorithm { diff --git a/be-graphes-gui/src/test/java/TestDijkstra.java b/be-graphes-gui/src/test/java/TestDijkstra.java index 33dc64e..3fa1be5 100644 --- a/be-graphes-gui/src/test/java/TestDijkstra.java +++ b/be-graphes-gui/src/test/java/TestDijkstra.java @@ -19,6 +19,7 @@ import org.insa.graphs.algorithm.shortestpath.ShortestPathData; import org.insa.graphs.algorithm.shortestpath.ShortestPathSolution; import org.insa.graphs.gui.drawing.Drawing; 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.Node; import org.insa.graphs.model.Path; @@ -118,12 +119,16 @@ public class TestDijkstra { coutPath = pathFromNodes.getLength(); } - if (type == 1) { - System.out.println("Coût DijkstraAstar: " + coutAlgo); - } else if (type == 2) { - System.out.println("Coût ProblemeOuvert: " + coutAlgo); - } else { - System.out.println("Coût Dijkstra: " + coutAlgo); + switch (type) { + case 1: + System.out.println("Coût DijkstraAstar: " + coutAlgo); + break; + case 2: + 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