From c5072b4729dc175a2a0ec442195af55cd8909b31 Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Thu, 18 May 2023 18:09:55 +0200
Subject: [PATCH] Astar probleme

---
 .../shortestpath/AStarAlgorithm.java          |  75 ++----------------
 .../shortestpath/DijkstraAlgorithm.java       |  27 ++++---
 .../graphs/algorithm/shortestpath/Label.java  |  21 ++++-
 .../algorithm/shortestpath/LabelStar.java     |  29 ++-----
 .../shortestpath/AStarAlgorithm.class         | Bin 5053 -> 1493 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 4755 -> 5172 bytes
 6 files changed, 46 insertions(+), 106 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 487f70a..0833f7b 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,9 +2,7 @@ package org.insa.graphs.algorithm.shortestpath;
 
 import org.insa.graphs.algorithm.AbstractSolution.Status;
 
-import java.lang.invoke.LambdaConversionException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
 import org.insa.graphs.algorithm.utils.BinaryHeap;
 import org.insa.graphs.model.Arc;
@@ -16,74 +14,11 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
     public AStarAlgorithm(ShortestPathData data) {
         super(data);
     }
+
     @Override
-    protected ShortestPathSolution doRun() {
-        final ShortestPathData data = getInputData();
-        ShortestPathSolution solution = null;
-        // TODO:
-        
-        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>();
-        
-        /* Initialise nos label */
-        for (Node x: data.getGraph().getNodes())
-        {
-            if(x != data.getOrigin()){
-                LabelStar a= new LabelStar(x,Double.MAX_VALUE,null,Point.distance(x.getPoint(),data.getDestination().getPoint()));
-                List_Label.add(x.getId(), a);
-            }
-            else{
-                LabelStar a  = new LabelStar(data.getOrigin(), 0, null,Point.distance(x.getPoint(),data.getDestination().getPoint()));
-                List_Label.add(data.getOrigin().getId(), a);
-            }
-            
-        }
-        Tas.insert(List_Label.get(data.getOrigin().getId()));
-        Label x;
-
-        while (!List_Label.get(data.getDestination().getId()).isMarque() && !Tas.isEmpty()){
-            x = Tas.findMin();
-            x.setMarque(true);
-            Tas.deleteMin();
-            
-            for(Arc suivant : x.getSommet().getSuccessors()){
-                // Small test to check allowed roads...
-                if (!data.isAllowed(suivant)) {
-                    continue;
-                }
-
-                Label l=List_Label.get(suivant.getDestination().getId());
-                    if(!l.isMarque()){
-                        Boolean changé = false;
-                        if (x.getTotalCost()+data.getCost(suivant) < l.getTotalCost()){
-                            changé = true;
-                        }
-                        if(changé){
-                            if (l.getTotalCost() != Double.MAX_VALUE){
-                                
-                                Tas.remove(l);
-                            }
-                            l.setCost(x.getTotalCost()+data.getCost(suivant));
-                            Tas.insert(l);
-                            l.setParent(suivant);
-                            
-                            notifyNodeReached(suivant.getDestination());
-                        }
-                    }
-            
-                }
-            
-        }
-        Label dest =List_Label.get(data.getDestination().getId());
-       
-        while (dest.getParent() != null){
-            Arcs.add(dest.getParent());
-            dest = List_Label.get(dest.getParent().getOrigin().getId());
-        }
-       
-        Collections.reverse(Arcs);
-        solution = new ShortestPathSolution(data, Status.OPTIMAL, new Path(data.getGraph(), Arcs));
-        return solution;
+    public Label CreationLabel(Node x, Double cout, Arc parent){
+        ShortestPathData data = getInputData();
+        return new LabelStar(x,cout,parent,Point.distance(x.getPoint(), data.getDestination().getPoint()));
     }
+    
 }
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 3fa7533..1cd907e 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
@@ -2,9 +2,7 @@ package org.insa.graphs.algorithm.shortestpath;
 
 import org.insa.graphs.algorithm.AbstractSolution.Status;
 
-import java.lang.invoke.LambdaConversionException;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
 import org.insa.graphs.algorithm.utils.BinaryHeap;
 import org.insa.graphs.model.Arc;
@@ -18,25 +16,30 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         
     }
 
+    public Label CreationLabel(Node x, Double cout, Arc parent){
+        return new Label(x,cout,parent);
+    }
+
     @Override
     protected ShortestPathSolution doRun() {
         final ShortestPathData data = getInputData();
         ShortestPathSolution solution = null;
-        // TODO:
         
         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>();
+
+        
         
         /* Initialise nos label */
         for (Node x: data.getGraph().getNodes())
         {
             if(x != data.getOrigin()){
-                Label a= new Label(x,Double.MAX_VALUE,null);
+                Label a= CreationLabel(x,Double.MAX_VALUE,null);
                 List_Label.add(x.getId(), a);
             }
             else{
-                Label a  = new Label(data.getOrigin(), 0, null);
+                Label a  = CreationLabel(data.getOrigin(), 0.0, null);
                 List_Label.add(data.getOrigin().getId(), a);
             }
             
@@ -54,21 +57,26 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
                 if (!data.isAllowed(suivant)) {
                     continue;
                 }
-
+                
                 Label l=List_Label.get(suivant.getDestination().getId());
                     if(!l.isMarque()){
                         Boolean changé = false;
-                        if (x.getTotalCost()+data.getCost(suivant) < l.getTotalCost()){
+                        if (x.getRealCost()+data.getCost(suivant) < l.getRealCost()){
                             changé = true;
                         }
                         if(changé){
-                            if (l.getTotalCost() != Double.MAX_VALUE){
+                            if (l.getRealCost() != Double.MAX_VALUE){
                                 
                                 Tas.remove(l);
+                                l.setCost(x.getRealCost()+data.getCost(suivant));
+                                Tas.insert(l);
+                                l.setParent(suivant);
                             }
-                            l.setCost(x.getTotalCost()+data.getCost(suivant));
+                            else{
+                            l.setCost(x.getRealCost()+data.getCost(suivant));
                             Tas.insert(l);
                             l.setParent(suivant);
+                            }
                             
                             notifyNodeReached(suivant.getDestination());
                         }
@@ -83,7 +91,6 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             Arcs.add(dest.getParent());
             dest = List_Label.get(dest.getParent().getOrigin().getId());
         }
-       
         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 a62dcf4..0dfe78f 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
@@ -22,12 +22,20 @@ public class Label implements Comparable<Label> {
     @Override
     public int compareTo(Label a) {
             int result;
-            if (a.getTotalCost() < cost){
-                result = 1;
-            }else if (a.getTotalCost()>cost){
+            if (this.getTotalCost() < a.cost){
                 result = -1;
+            }else if (this.getTotalCost()>a.cost){
+                result = 1;
             }else {
-                result = 0;
+                if(this.getTotalCost() == this.cost){
+                    result=1;
+                }
+                else if (this.cost <a.cost){
+                    result = -1;
+                }
+                else{
+                    result = 0;
+                }
             }
         return result;
     }
@@ -41,6 +49,11 @@ public class Label implements Comparable<Label> {
     public double getTotalCost() {
         return cost;
     }
+
+    public double getRealCost()
+    {
+        return cost;
+    }
     public Arc getParent() {
         return parent;
     }
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 b6bf335..a92645f 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
@@ -7,23 +7,20 @@ import org.insa.graphs.model.Node;
 
 public class LabelStar extends Label{
     private double cost_Destination;
-    private double cost_Origin;
+    private double cost;
 
-    public LabelStar(Node sommet, double cost_Origin, Arc parent,double cost_Destination)
+
+    public LabelStar(Node sommet, double cost, Arc parent,double cost_Destination)
     {
-        super(sommet, cost_Origin, parent);
-        this.cost_Origin = cost_Origin;
+        super(sommet, cost, parent);
+        this.cost=cost;
         this.cost_Destination=cost_Destination;
 
     }
-
-    @Override
-    public int compareTo(Label a) {
-        return super.compareTo(a);
-    }
+    
     @Override
     public double getTotalCost() {
-        return cost_Destination+cost_Origin;
+        return this.cost_Destination+this.cost;
     }
 
 
@@ -32,18 +29,6 @@ public class LabelStar extends Label{
     }
 
 
-    public void setCost_Destination(double cost_Destination) {
-        this.cost_Destination = cost_Destination;
-    }
 
-
-    public double getCost_Origin() {
-        return cost_Origin;
-    }
-
-
-    public void setCost_Origin(double cost_Origin) {
-        this.cost_Origin = cost_Origin;
-    }
     
 }
diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/AStarAlgorithm.class
index 2eae295b389afa4e21c9f40793568116de06aa1f..fbcdc60980919655c655bfab276f6a3d5e6f54fd 100644
GIT binary patch
delta 533
zcmZXQPj3=o5XOIlyKK8Gl&uPFDg7f=pcJXviWW^w%CYgFiHV7qZP_#!0+lYtCMJFa
zL*B39K`&@D8qeN5c=j{+1&qUb)5|;aJ~Q*oGtcMpk5u;C?~h-A9a;_vVRt+(ziU1a
zKfON;gQz>`9|VVCPdGEr+=cx8K__e-JPn=)jb6|{ZnOuZ!(P}jzno>`y9INSK5xFu
z6WLZ8b1!M{Ka7H*%OVAbB_aFoq{lKvA=Qa_9tFKoD4eTQ+b*lDJFE#y=4&E1J6-H?
ziIRD3HD)hUcDN!m$Kz(fqe4~49EVXmJdL{jShlcIsT$wTr(?}7HR=vq=BKshU!@_;
zbh@We&_B|Jcc-_Rid|0SxaMJVUAPltLwmy!<b|O3+4*|RC0Iv;Q6$X&?}U&%35H=`
zs|9tXVC+oEV;#LpU512tnW@=xx+81eWQwoU6MU^YT03J#aVTw0nBTKLk$YU*ny^r>
zO;}m9CTwW@z~+0l-%hD;^>sDE1(IAOrP<D33Ov&KQ!;KSCULgQ&A7WnlUph%iC-kc
N9F{iR)|Lc&e*oYnY61WN

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

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 91bc88795af1264d99e346348081f96aa281f981..2bc0b8aae80075bfd05479e9605a6decfd9dab9c 100644
GIT binary patch
literal 5172
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
Rc$5Fj!2BX{__vLr{{idnoVfr1

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