From d867c0db7f4bd91f2c68c1138648de1e8deef90b Mon Sep 17 00:00:00 2001
From: georgia <koutsodi@insa-toulouse.fr>
Date: Wed, 12 Apr 2023 18:28:13 +0200
Subject: [PATCH] dijkstra * a completer

---
 .../insa/graphs/algorithm/shortestpath/AStarAlgorithm.java  | 6 ++++--
 .../graphs/algorithm/shortestpath/DijkstraAlgorithm.java    | 1 -
 .../java/org/insa/graphs/algorithm/shortestpath/Label.java  | 2 --
 .../org/insa/graphs/algorithm/shortestpath/LabelStar.java   | 1 +
 4 files changed, 5 insertions(+), 5 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 5db7aaf..c3ecf49 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
@@ -2,6 +2,8 @@ package org.insa.graphs.algorithm.shortestpath;
 
 import java.util.ArrayList;
 
+import org.insa.graphs.model.Point;
+
 
 public class AStarAlgorithm extends DijkstraAlgorithm {
 
@@ -10,12 +12,12 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
     }
 
     /*on redéfinit l'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 */
         for (int i=0;i<n;i++){
-            tab.add(new LabelStar(data.getGraph().get(i), false, Double.POSITIVE_INFINITY , null,0.0));
+            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 1d7a24b..f8c8dbe 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
@@ -10,7 +10,6 @@ import java.util.Collections;
 import org.insa.graphs.algorithm.utils.BinaryHeap;
 
 public class DijkstraAlgorithm extends ShortestPathAlgorithm {
-
     /*initialisation */
     void init(ArrayList<Label> tab){
         /*nombre de nodes du graphe de data */
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 e0cc9f1..14c9e4b 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
@@ -24,8 +24,6 @@ public class Label implements Comparable<Label>{
     /*méthodes */
     /*récupérer le cout */
     public double getCost() { return this.coutmin;}
-    /*récupérer le cout réalisé */
-    public double getCout() { return this.coutmin;}
     /*récupérer le sommet du label */
     public Node getSommet() { return this.sommet;}
     /*récupérer la marque */
diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
index 264e65d..dd8351c 100644
--- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
@@ -17,6 +17,7 @@ public class LabelStar extends Label {
 
     /*méthodes */
     /*récupérer le cout total */
+    @Override
     public double getTotalCost() { return this.getCost()+this.coutest;}