From 0e43c205b5fd855022714681d6431dfafd622178 Mon Sep 17 00:00:00 2001
From: Bensouda Idriss <bensoud@insa-20163>
Date: Wed, 19 Apr 2023 15:25:07 +0200
Subject: [PATCH] rien

---
 .../shortestpath/DijkstraAlgorithm.java       |  27 +++++++++---------
 .../shortestpath/DijkstraAlgorithm.class      | Bin 5197 -> 5134 bytes
 2 files changed, 14 insertions(+), 13 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 6613e11..7d49298 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
@@ -24,21 +24,20 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         ArrayList<Label> List = new ArrayList<Label>(); //List de labels
         BinaryHeap<Label> Tas = new BinaryHeap<Label>();
         ArrayList<Arc> arcs = new ArrayList<Arc>();
-        Label dest = null;
         
         for (Node x: data.getGraph().getNodes())
         {
             Label a= new Label(x,Double.MAX_VALUE,null);
-            if (a.getSommet() == data.getDestination()){
-                dest = a;
-            } 
             List.add(a);
         }
         List.get(data.getOrigin().getId()).setCost(0);
         Tas.insert(List.get(data.getOrigin().getId()));
         int i = 1;
         Label x;
-        while (dest.isMarque() == false){
+        Label pre = null;
+
+        while (List.get(data.getDestination().getId()).isMarque()){
+            //System.out.println(List);
             x = Tas.findMin();
             x.setMarque(true);
             Tas.deleteMin();
@@ -52,28 +51,30 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                                 changé = true;
                             }
                             if(changé){
-                                if (arcs.size() < i ){
-                                    System.out.println("arc");
-                                }else if (l.getCost() < arcs.get(i-1).getLength()){
-                                    arcs.remove(i-1);
+                                 if (l.getCost() < data.getCost(pre.getParent())){
+                                    Tas.remove(pre);
                                     System.out.println("remove");
                                 }
+                                pre = l;
+                                l.setCost(Math.min(l.getCost(), x.getCost()+data.getCost(suivant)));
                                 Tas.insert(l);
                                 l.setParent(suivant);
-                                arcs.add(suivant);
                                 l.setMarque(true);
+                               // System.out.println(List);
                             }
-                            l.setCost(Math.min(l.getCost(), x.getCost()+data.getCost(suivant)));
                         }
                     }
                 }
             }
             i++;
         }
+        Label dest =List.get(data.getDestination().getId());
+        while (dest.getParent() != null){
+            arcs.add(dest.getParent());
+            dest = List.get(dest.getParent().getOrigin().getId());
+        }
         System.out.println(data.getDestination());
-        System.out.println(dest.getSommet());
         System.out.println(arcs);
-        System.out.println(arcs.get(arcs.size()-1).getDestination());
         solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), arcs));
         return solution;
     }
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 f2538ec56004b32f35fd9f044f5615c820167210..0f07cc48922bcbbe3056e831f02986e3283ed7b4 100644
GIT binary patch
delta 2273
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

delta 2315
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
HTAhCbVoT`A