From 018d321be4944976b17fa9be8e4d3ea178d5e3d8 Mon Sep 17 00:00:00 2001
From: georgia <koutsodi@insa-toulouse.fr>
Date: Sun, 16 Apr 2023 10:56:42 +0200
Subject: [PATCH] Dikjstra et A*

---
 .../insa/graphs/algorithm/shortestpath/AStarAlgorithm.java  | 1 +
 .../graphs/algorithm/shortestpath/DijkstraAlgorithm.java    | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java
index c3ecf49..b6c8bb2 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.java
@@ -19,6 +19,7 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
         for (int i=0;i<n;i++){
             tab.add(new LabelStar(data.getGraph().get(i), false, Double.POSITIVE_INFINITY , null,data.getGraph().get(i).getPoint().distanceTo(destination)));
         }
+
     }
 
 }
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 f8c8dbe..41be114 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
@@ -6,12 +6,13 @@ import org.insa.graphs.model.Path;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import org.insa.graphs.model.Point;
 
 import org.insa.graphs.algorithm.utils.BinaryHeap;
 
 public class DijkstraAlgorithm extends ShortestPathAlgorithm {
     /*initialisation */
-    void init(ArrayList<Label> tab){
+    void init(ArrayList<Label> tab, Point destination){
         /*nombre de nodes du graphe de data */
         int n=data.getGraph().size();
         /*on remplit tab */
@@ -30,7 +31,8 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         ArrayList<Label> tab=new ArrayList<Label>();
         BinaryHeap<Label> tas=new BinaryHeap<Label>();
         ShortestPathSolution solution = null;
-        init(tab);
+        /*initialisation */
+        init(tab,data.getDestination().getPoint());
         Label label_origine = tab.get(data.getOrigin().getId());
         label_origine.setCoutmin(0);
         Label label_dest =tab.get(data.getDestination().getId());