From 3a6de0eddb789d3af9a3e7d71fd7da13f5133171 Mon Sep 17 00:00:00 2001 From: Thior Youssouf-Ben-Abdallah Date: Tue, 20 May 2025 12:23:44 +0200 Subject: [PATCH] test de Dijkstra et A* deplaces dans les tests --- .../org/insa/graphs/algorithm/utils}/AStarTest.java | 2 +- .../org/insa/graphs/algorithm/utils}/DijkstraTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) rename be-graphes-algos/src/test/{ => java/org/insa/graphs/algorithm/utils}/AStarTest.java (84%) rename be-graphes-algos/src/test/{ => java/org/insa/graphs/algorithm/utils}/DijkstraTest.java (90%) diff --git a/be-graphes-algos/src/test/AStarTest.java b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/AStarTest.java similarity index 84% rename from be-graphes-algos/src/test/AStarTest.java rename to be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/AStarTest.java index 6b38bb0..d1dc628 100644 --- a/be-graphes-algos/src/test/AStarTest.java +++ b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/AStarTest.java @@ -1,4 +1,4 @@ -package org.insa.graphes.model; +package org.insa.graphs.algorithm.utils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/be-graphes-algos/src/test/DijkstraTest.java b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/DijkstraTest.java similarity index 90% rename from be-graphes-algos/src/test/DijkstraTest.java rename to be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/DijkstraTest.java index f77b699..db8218b 100644 --- a/be-graphes-algos/src/test/DijkstraTest.java +++ b/be-graphes-algos/src/test/java/org/insa/graphs/algorithm/utils/DijkstraTest.java @@ -1,14 +1,13 @@ -package org.insa.graphs.gui.simple; - +package org.insa.graphs.algorithm.utils; import java.io.*; import org.insa.graphs.model.*; import org.insa.graphs.model.io.*; import org.insa.graphs.algorithm.shortestpath.*; - +import org.insa.graphs.algorithm.ArcInspectorFactory; import org.insa.graphs.algorithm.AbstractSolution.Status; +import org.insa.graphs.algorithm.ArcInspector; @SuppressWarnings("deprecation") -@Test public class DijkstraTest { public static void main(String[] args) throws Exception { @@ -34,8 +33,9 @@ public class DijkstraTest { // === données pour Dijkstra === Node origin = referencePath.getOrigin(); Node destination = referencePath.getDestination(); + ArcInspector inspector = ArcInspectorFactory.getAllFilters().get(0); // Indice 0 = "Shortest path, all roads allowed" + ShortestPathData data = new ShortestPathData(graph, origin, destination, inspector); - ShortestPathData data = new ShortestPathData(graph, origin, destination, ArcInspectorFactory.getAllFilters().get(0)); DijkstraAlgorithm dijkstra = new DijkstraAlgorithm(data); // === Exécution de l'algorithme ===