From 29339a9e86a6bf677c2e75ae3492d2bdddff4c73 Mon Sep 17 00:00:00 2001
From: brunetto <brunetto@insa-toulouse.fr>
Date: Wed, 5 Apr 2023 18:16:57 +0200
Subject: [PATCH] =?UTF-8?q?Djikstra=20v1=20finalis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shortestpath/DijkstraAlgorithm.java       | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 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 27eae44..ee64861 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.Arrays;
 import java.util.Collections;
 import org.insa.graphs.model.Node;
 import org.insa.graphs.model.Arc;
@@ -21,6 +20,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         int tailleGraphe = data.getGraph().size();
         int index = 0;
 
+
         ArrayList<Label> labelSommets = new ArrayList<Label>();
         Label currentLabel;
 
@@ -45,6 +45,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         double currentCost;
         double newCost;
         Label newLabel;
+        notifyOriginProcessed(currentNode);
 
         //Boucle principale ----------------------------------------------------
 
@@ -57,26 +58,34 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             index = currentNode.getId();
             currentLabel.setMarqueTrue();
 
+
+            notifyNodeMarked(currentNode);
+
             
             for(Arc arc : currentNode.getSuccessors())
             {
-                newLabel = labelSommets.get(arc.getDestination().getId());
-                if(!newLabel.getMarque())
+                if(data.isAllowed(arc))
                 {
-                    currentCost = newLabel.getCost();
-                    newCost = arc.getLength() + currentLabel.getCost();
-                    if(currentCost == -1.0)
+                    newLabel = labelSommets.get(arc.getDestination().getId());
+                    if(!newLabel.getMarque())
                     {
-                        newLabel.setNouveauChemin(arc, newCost);
-                        leTas.insert(newLabel);
-                    }
-                    else if(newCost < currentCost)
-                    {
-                        leTas.remove(newLabel);
-                        newLabel.setNouveauChemin(arc, newCost);
-                        leTas.insert(newLabel);
+                        currentCost = newLabel.getCost();
+                        newCost = data.getCost(arc) + currentLabel.getCost();
+                        if(currentCost == -1.0)
+                        {
+                            newLabel.setNouveauChemin(arc, newCost);
+                            leTas.insert(newLabel);
+                            notifyNodeReached(newLabel.getSommetCourant());
+                        }
+                        else if(newCost < currentCost)
+                        {
+                            leTas.remove(newLabel);
+                            newLabel.setNouveauChemin(arc, newCost);
+                            leTas.insert(newLabel);
+                        }
                     }
                 }
+                
             }
         }
 
@@ -101,6 +110,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         if(index != tailleGraphe)
         {
             Collections.reverse(arcListe);
+            notifyDestinationReached(data.getDestination());
             return new ShortestPathSolution(data, AbstractSolution.Status.FEASIBLE, new Path(data.getGraph(),arcListe ));
         }