From e249625793d6ceb6b341291d0eb083964edf30d8 Mon Sep 17 00:00:00 2001
From: moll <moll@insa-toulouse.fr>
Date: Wed, 6 May 2026 16:20:23 +0200
Subject: [PATCH] =?UTF-8?q?Dijkstra=20Updated=20(pour=20le=20c=C3=B4ut=20e?=
 =?UTF-8?q?t=20les=20limitations)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graphs/algorithm/shortestpath/DijkstraAlgorithm.java | 9 +++++++--
 .../org/insa/graphs/algorithm/shortestpath/Label.java    | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
index 5725002..d144907 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.java
@@ -1,7 +1,6 @@
 package org.insa.graphs.algorithm.shortestpath;
 
 import java.util.ArrayList;
-import java.util.Collections;
 
 import org.insa.graphs.algorithm.AbstractSolution.Status;
 import org.insa.graphs.algorithm.utils.BinaryHeap;
@@ -52,8 +51,14 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                 notifyNodeReached(concurentNodeLabel.getSommetCourant());
                 concurentNodeLabel.setMarque();
                 for (Arc arc : concurentNodeLabel.getSommetCourant().getSuccessors()) {
+
+                    // Small test to check allowed roads...
+                    if (!data.isAllowed(arc)) {
+                        continue;
+                    }
+
                     Label successorLabel = labelsList.get(arc.getDestination().getId());
-                    Float newCost = arc.getLength() + concurentNodeLabel.getCost();
+                    Double newCost = data.getCost(arc) + concurentNodeLabel.getCost();
                     if (newCost < successorLabel.getCost()) {
                         successorLabel.setPere(arc);
                         successorLabel.setCoutRealise(newCost);
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java
index d6cdd88..8adca05 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Label.java
@@ -9,14 +9,14 @@ public class Label implements Comparable<Label> {
 
     private Boolean marque;
 
-    private float coutRealise;
+    private double coutRealise;
     
 	private Arc pere;
 	
 	public Label(Node sommetCourant) {
 		this.sommetCourant = sommetCourant;
 		this.marque = false;
-		this.coutRealise = Float.POSITIVE_INFINITY;
+		this.coutRealise = Double.POSITIVE_INFINITY;
 	}
 
     public Node getSommetCourant() {
@@ -43,11 +43,11 @@ public class Label implements Comparable<Label> {
 	// 	return coutRealise;
 	// }
 	
-	public void setCoutRealise(float nouveauCout) {
+	public void setCoutRealise(double nouveauCout) {
 		this.coutRealise = nouveauCout;
 	}
 
-	public float getCost() {
+	public double getCost() {
 		return coutRealise;
 	}