From fa87e8d63bcc2fdd9172d261500ef6be1200d8e5 Mon Sep 17 00:00:00 2001
From: moll <moll@insa-toulouse.fr>
Date: Mon, 20 Apr 2026 06:39:27 +0200
Subject: [PATCH] NOT FINISHED : Dijkstra

---
 .../shortestpath/DijkstraAlgorithm.java       | 40 +++++++++++--------
 .../graphs/algorithm/shortestpath/Label.java  |  8 ++--
 2 files changed, 27 insertions(+), 21 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 58b071a..e264459 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
@@ -40,29 +40,35 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         Label concurentNodeLabel = labelsList.get(data.getOrigin().getId());
         concurentNodeLabel.setCoutRealise(0);
         concurentNodeLabel.setMarque();
+
+        notifyOriginProcessed(data.getOrigin());
         
         BinaryHeap<Label> labelsHeap = new BinaryHeap<Label>();
+        labelsHeap.insert(concurentNodeLabel);
         
         boolean found = false;
-        for (int i = 0; !found && i < nbNodes; ++i) {
-        	for (Arc arc : concurentNodeLabel.getSommetCourant().getSuccessors()) {
-        		Label successorLabel = labelsList.get(arc.getDestination().getId());
-        		successorLabel.setCoutRealise(arc.getLength());
-        		// GERER LA SOMME DES COUTS POUR LE NOUVEAU ALBEL
-        		if (arc.getLength() < successorLabel.getCost()) {
-        			labelsHeap.remove(successorLabel);
-        		}
-        		successorLabel.setPere(arc);
-        		labelsHeap.insert(successorLabel);
-        	}
-        	concurentNodeLabel = labelsHeap.deleteMin();
-        	concurentNodeLabel.setMarque();
-        	if (destinationNodeLabel.getMarque()) {
-        		found = true;
-        	}
-        }
+        while (!found && !labelsHeap.isEmpty()) {
+            concurentNodeLabel = labelsHeap.deleteMin();
+            if (!concurentNodeLabel.getMarque()) {
+                notifyNodeReached(concurentNodeLabel.getSommetCourant());
+                concurentNodeLabel.setMarque();
+                for (Arc arc : concurentNodeLabel.getSommetCourant().getSuccessors()) {
+                    Label successorLabel = labelsList.get(arc.getDestination().getId());
+                    Float newCost = arc.getLength() + concurentNodeLabel.getCost();
+                    if (newCost < successorLabel.getCost()) {
+                        successorLabel.setPere(arc);
+                        successorLabel.setCoutRealise(newCost);
+                        labelsHeap.insert(successorLabel);
+                    }
+                } 
+                if (destinationNodeLabel.getMarque()) {
+                    found = true;
+                }
+            }
+        } 
         
         notifyDestinationReached(data.getDestination());
+
         ArrayList<Arc> pathArcs = new ArrayList<Arc>();
         concurentNodeLabel = destinationNodeLabel;
         while(concurentNodeLabel.getPere() != null) {
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 0250500..d6cdd88 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
@@ -39,9 +39,9 @@ public class Label implements Comparable<Label> {
 		this.pere = pere;
 	}
 	
-	 public double getCoutRealise() {
-		return coutRealise;
-	}
+	// public double getCoutRealise() {
+	// 	return coutRealise;
+	// }
 	
 	public void setCoutRealise(float nouveauCout) {
 		this.coutRealise = nouveauCout;
@@ -53,7 +53,7 @@ public class Label implements Comparable<Label> {
 	
 	@Override
 	public int compareTo(Label o) {
-		return Double.compare(this.coutRealise, o.getCoutRealise()) ;
+		return Double.compare(this.coutRealise, o.getCost()) ;
 	}