From 23e82a6ba0d83702cb4f077c2e7f1f782aa434d1 Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Mon, 15 May 2023 10:21:46 +0200
Subject: [PATCH] Dijkstra final

---
 .../shortestpath/DijkstraAlgorithm.java       |  81 ++++++++----------
 .../graphs/algorithm/shortestpath/Label.java  |   1 -
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5248 -> 4662 bytes
 3 files changed, 37 insertions(+), 45 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 a9fde9f..e50512b 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
@@ -15,6 +15,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
 
     public DijkstraAlgorithm(ShortestPathData data) {
         super(data);
+        
     }
 
     @Override
@@ -23,71 +24,63 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         ShortestPathSolution solution = null;
         // TODO:
         
-        ArrayList<Label> List = new ArrayList<Label>(); //List de labels
+        ArrayList<Label> List_Label = new ArrayList<Label>(data.getGraph().size()); //Liste de labels
         BinaryHeap<Label> Tas = new BinaryHeap<Label>();
-        ArrayList<Arc> arcs = new ArrayList<Arc>();
+        ArrayList<Arc> Arcs = new ArrayList<Arc>();
         
         /* Initialise nos label */
         for (Node x: data.getGraph().getNodes())
         {
-            Label a= new Label(x,Double.MAX_VALUE,null);
-            List.add(a);
+            if(x != data.getOrigin()){
+                Label a= new Label(x,Double.MAX_VALUE,null);
+                List_Label.add(x.getId(), a);
+            }
+            else{
+                Label a  = new Label(data.getOrigin(), 0, null);
+                List_Label.add(data.getOrigin().getId(), a);
+            }
+            
         }
-        List.get(data.getOrigin().getId()).setCost(0);
-        Tas.insert(List.get(data.getOrigin().getId()));
+        Tas.insert(List_Label.get(data.getOrigin().getId()));
         Label x;
-        Label pre =null;
-        
-        int i =0;
-        while (!List.get(data.getDestination().getId()).isMarque() && !Tas.isEmpty()){
+
+        while (!List_Label.get(data.getDestination().getId()).isMarque() && !Tas.isEmpty()){
             x = Tas.findMin();
             x.setMarque(true);
             Tas.deleteMin();
-            if(i ==0){pre= new Label(data.getOrigin(), Double.MAX_VALUE, x.getSommet().getSuccessors().get(0)); i++;}//Permet d'initialiser le pre pour faire avancer l'algo
-
+            
             for(Arc suivant : x.getSommet().getSuccessors()){
-                Node y = suivant.getDestination();
-                for (Label l : List){
-                    if (l.getSommet()==y){
-                        if(!l.isMarque()){
-                            Boolean changé = false;
-                            if (x.getCost()+data.getCost(suivant) <= l.getCost()){
-                                changé = true;
-                            }
-                            if(changé){
-                                 if (l.getCost() <= data.getCost(pre.getParent())){
-                                    Tas.remove(pre);
-                                }
+                Label l=List_Label.get(suivant.getDestination().getId());
+                    if(!l.isMarque()){
+                        Boolean changé = false;
+                        if (x.getCost()+data.getCost(suivant) < l.getCost()){
+                            changé = true;
+                        }
+                        if(changé){
+                            if (l.getCost() != Double.MAX_VALUE){
                                 
-                                l.setCost(Math.min(l.getCost(), x.getCost()+data.getCost(suivant)));
-                                pre = l;
-                                Tas.insert(l);
-                                l.setParent(suivant);
-                                l.setMarque(true);
-                            notifyNodeReached(suivant.getDestination());
-
+                                Tas.remove(l);
                             }
+                            l.setCost(x.getCost()+data.getCost(suivant));
+                            Tas.insert(l);
+                            l.setParent(suivant);
+                            
+                            notifyNodeReached(suivant.getDestination());
                         }
                     }
+            
                 }
-            }
+            
         }
-        Label dest =List.get(data.getDestination().getId());
+        Label dest =List_Label.get(data.getDestination().getId());
        
-        int nbarc =0;
         while (dest.getParent() != null){
-            System.out.println(dest.getParent());
-            arcs.add(dest.getParent());
-            dest = List.get(dest.getParent().getOrigin().getId());
-            nbarc++;
+            Arcs.add(dest.getParent());
+            dest = List_Label.get(dest.getParent().getOrigin().getId());
         }
        
-      
-        System.out.println("nbarc: "+ nbarc);
-        System.out.println(data.getDestination());
-        System.out.println(arcs);
-        Collections.reverse(arcs);
-        solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), arcs));
+        Collections.reverse(Arcs);
+        solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), Arcs));
         return solution;
     }
 
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 104cf91..03ad4fc 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
@@ -1,6 +1,5 @@
 package org.insa.graphs.algorithm.shortestpath;
 
-import java.util.ArrayList;
 
 import org.insa.graphs.model.Arc;
 import org.insa.graphs.model.Node;
diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/DijkstraAlgorithm.class
index aa0428ed28b1e4fb5a756994130df0dc2f88f86a..d99e4d5e448a5b2cee67d690b22860ebe67b5590 100644
GIT binary patch
literal 4662
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

literal 5248
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