From 36249318ce92a0f96999f7aae3091af37181677c Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Tue, 4 Apr 2023 18:08:48 +0200
Subject: [PATCH] Dijkstra V1

---
 .../shortestpath/DijkstraAlgorithm.java       |  19 +++++++++
 .../graphs/algorithm/shortestpath/Label.java  |  36 +++++++++++++++---
 .../shortestpath/DijkstraAlgorithm.class      | Bin 976 -> 2408 bytes
 3 files changed, 50 insertions(+), 5 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 bacb8e3..ef9935e 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,5 +1,11 @@
 package org.insa.graphs.algorithm.shortestpath;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.insa.graphs.algorithm.utils.BinaryHeap;
+import org.insa.graphs.model.Node;
+
 public class DijkstraAlgorithm extends ShortestPathAlgorithm {
 
     public DijkstraAlgorithm(ShortestPathData data) {
@@ -11,6 +17,19 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         final ShortestPathData data = getInputData();
         ShortestPathSolution solution = null;
         // TODO:
+        
+        ArrayList<Label> List = new ArrayList<Label>(); //List de labels
+        BinaryHeap<Label> Tas = new BinaryHeap<Label>();
+        
+        for (Node x: data.getGraph().getNodes())
+        {
+            Label a= new Label(x,false,0,null);
+            List.add(a);
+
+        }
+        List.get(0).setCost(0);
+        Tas.insert(List.get(0));
+
         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 f8ab848..675e153 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
@@ -5,12 +5,12 @@ import java.util.ArrayList;
 import org.insa.graphs.model.Arc;
 import org.insa.graphs.model.Node;
 
-public class Label {
+public class Label implements Comparable<Label> {
     private Node sommet;
     private boolean marque;
     private double cost;
     private Arc parent;
-    private final ArrayList<Node> listLabels;
+
 
   
     public Label(Node sommet, boolean marque, double cost, Arc parent) {
@@ -18,11 +18,13 @@ public class Label {
         this.marque = marque;
         this.cost = cost;
         this.parent = parent;
-        listLabels = new ArrayList<Node>();
-        listLabels.add(sommet);
-
     }
 
+    @Override
+    public int compareTo(Label arg0) {
+        // TODO Auto-generated method stub
+        return 0;
+    }
 
     public Node getSommet() {
         return sommet;
@@ -36,5 +38,29 @@ public class Label {
     public Arc getParent() {
         return parent;
     }
+
+
+    public void setSommet(Node sommet) {
+        this.sommet = sommet;
+    }
+
+
+    public void setMarque(boolean marque) {
+        this.marque = marque;
+    }
+
+
+    public void setCost(double cost) {
+        this.cost = cost;
+    }
+
+
+    public void setParent(Arc parent) {
+        this.parent = parent;
+    }
+
+
+    
+    
     
 }
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 e57e5e6d40f2e1cf62341c53b3dc1d0774ef0e41..9bdf5963a88a8ca9310c8ac6ff24796f2d778e0a 100644
GIT binary patch
literal 2408
zcmbVNYgZFj6y29RE{!87mDGTWw%R7VrY|ZI#3E6_hG-3iLT&3!G9`l{lQlDR$zSOo
z=-2j3Sjt*me(o>muTl4%1PCO!D4CU+xpU9i=bU{W_un_K{sHhcev{}Dm~`BA)2@2T
zTz6Hi?3t>v?zpyJ-ZZ_k<NB88*OXs2Gxo-F&v(`A-nK+oVETmG`6kq3LhU06M5pbl
z?avS=nLPzkM)@k8S{4Y;IVCHG5I!&vK~$hOYget@)@H$SmsFu*3G`*1qN*$_*VgOi
z$FN_vJ%Oo{8gC;ZP1_}UA#m%Y7_C$U0SH7&&XcXGz@233G$?tevgO-OH64S%hXyX7
zU%*(m{Do?5%hxsp(x-zC9F+KoxEtzsWztT?oONBbowYqbhBy+M@d1HQGPNvmNnrT+
zL~3o%ylYpLyFG8IS`33o#4v<w5?2Lo9<O<*6pu1!;A4Cu(9MV+=o%In>JaTFOQd23
z0wn4NK9l%VVDPBT7BK@!q#C$6Dzi}fh<m_;rXYO=BN&qy73ev<V_+O6wQb*WmG8I$
z@k81R&F@6`0$)jdN%#YVy<LNiI>92VS}%No3wsC^Rb4k96*jD*pO&~OFwi*;?YG1&
zfzhM;$FzA?6|71OlSu2lPIv6g21Ob=y_RV!*v9UxTV!YI0+}&z2j8+lRH-D;pKK7=
z8bE4IQ*hV795Mp3th`(hElX-mBiuLe0P{p(f;GZIGYPF2+U17^zC)G>p5@Ou9%aMH
zjCNuWIRlUIm;;BC&T_evX!T>x*{ms7&xK%`bbHN)61d$K-Z8wj*5rOa(g9r~^tq*K
z_Pd9(BebMgRip1Qa<pZrBwh$yYEx-R3PsrQ<830xxE`dOxbedia=W%SCGU0ee)|8x
z&(Ofr_oy6=^AzxB^S&xRUsSbVxJx|a)H`9-cgh|a>@Y<RIGio$<FM%OXIoF-qJeWb
zFA&Q+TW-<1Z|kEc-gaz^>qf^lDuj3xgLfVRi1IGEnn4#YAUZs<gYLii)`b}FvEZxj
z%d<Gcb-W=3gKPbZq6fXi2x}i2SYn!p-Q07A>pTL*;x6K=JGhwJ#UP)Tr@|w3T&d&w
zOAPZIjQ)x1iRepwF7O)POhtAvxtfTCdc+Q<rsP;c)^U493(N}q@%F#5P#yPPW3s1?
zg+zF7RmbA!Uo;sGoE{HcJx{0m=t@5wjN>A&2@J5`2l0^aOSpn(JO(yNi4JT&puuSd
z7Qsd{Fo`n0#}kI#OZhzYLeyTt4_KzP38JsyM_QVr{wmgZ|A}atriT2}efgg${|omn
zqw6hFkP<>-Na9zCxTIH-0|{5pWyqvzX5|K-f+`U*S<vw{lA@Ca{<YsaX#%C-&3Xs$
C44qj3

delta 195
zcmaDMbb(#q)W2Q(7#J8#7-ZQQm>3x>CMPmUP1a|W+vxF%ak2udFN>arrVm)qgI$zS
zYH}QV5-S@6D+BxFqwE^t4E_v^49r0NoLbu$gnSr%bv6JwOblE=k`FAw4OGj+zz*bb
z1H}{|ih&}$Kprat3s9UNXavx11~CS41||U)1_1_%$%dT5Dv}7J*nmnHfEZ*16PP6p
HX2}2m$K)3@