From 7624518c7ee6188b4c307357d53a21a0c192643f Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Thu, 18 May 2023 19:09:10 +0200
Subject: [PATCH] Astar Fini

---
 .../shortestpath/AStarAlgorithm.java          |  15 ++++++++++--
 .../shortestpath/DijkstraAlgorithm.java       |  12 ++++++---
 .../graphs/algorithm/shortestpath/Label.java  |  23 ++++++++++++------
 .../algorithm/shortestpath/LabelStar.java     |  11 +--------
 .../shortestpath/AStarAlgorithm.class         | Bin 1493 -> 3094 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 6153 -> 6543 bytes
 6 files changed, 38 insertions(+), 23 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 e30befe..f00186c 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
@@ -1,7 +1,8 @@
 package org.insa.graphs.algorithm.shortestpath;
 import org.insa.graphs.model.Arc;
 import org.insa.graphs.model.Node;
-
+import org.insa.graphs.model.Path;
+import java.util.ArrayList;
 import org.insa.graphs.model.Point;
 public class AStarAlgorithm extends DijkstraAlgorithm {
 
@@ -12,7 +13,17 @@ public class AStarAlgorithm extends DijkstraAlgorithm {
     @Override
     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()));
+        return new LabelStar(x,cout,parent,Point.distance(data.getGraph().get(x.getId()).getPoint(), data.getDestination().getPoint()));
     }
     
+    @Override
+    public void ShortestVerif(ShortestPathSolution solution,ArrayList<Node> solutionNodes , ShortestPathData data)
+    {
+        Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
+        System.out.println("shortest path : " + p.getLength());
+        if (p.getLength()-solution.getPath().getLength() < 1.00){
+            System.out.println("le chemin Astar est le shortest");
+        }
+
+    }
 }
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 7ea02b7..f6430d8 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
@@ -97,13 +97,19 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             solutionNodes.add(a.getOrigin());
         }
         solutionNodes.add(data.getDestination());
+        ShortestVerif(solution, solutionNodes, data);
+        
+        return solution;
+
+    }
+
+    public void ShortestVerif(ShortestPathSolution solution,ArrayList<Node> solutionNodes , ShortestPathData data)
+    {
         Path p = Path.createShortestPathFromNodes(data.getGraph(), solutionNodes);
-        Path p2 = Path.createFastestPathFromNodes(data.getGraph(), solutionNodes);
         System.out.println("shortest path : " + p.getLength());
         if (p.getLength()-solution.getPath().getLength() < 1.00){
             System.out.println("le chemin Dijkstra est le shortest");
         }
-        
-        return solution;
+
     }
 }
\ No newline at end of file
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 0dfe78f..be5d384 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,20 +22,27 @@ public class Label implements Comparable<Label> {
     @Override
     public int compareTo(Label a) {
             int result;
-            if (this.getTotalCost() < a.cost){
+            if (this.getTotalCost() < a.getTotalCost()){
                 result = -1;
-            }else if (this.getTotalCost()>a.cost){
+            }else if (this.getTotalCost()>a.getTotalCost()){
                 result = 1;
             }else {
-                if(this.getTotalCost() == this.cost){
-                    result=1;
-                }
-                else if (this.cost <a.cost){
-                    result = -1;
+                if(this.getRealCost() == a.getRealCost()){
+                    result=0;
                 }
                 else{
-                    result = 0;
+                    if (this.getRealCost() <a.getRealCost()){
+                        result = -1;
+                    }
+                    else if(this.getRealCost() > a.getRealCost()){
+                        result = 1;
+                    }
+                    else{
+                        result = 0;
+                    }
+
                 }
+                
             }
         return result;
     }
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 a92645f..24b746d 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,28 +7,19 @@ import org.insa.graphs.model.Node;
 
 public class LabelStar extends Label{
     private double cost_Destination;
-    private double cost;
 
 
     public LabelStar(Node sommet, double cost, Arc parent,double cost_Destination)
     {
         super(sommet, cost, parent);
-        this.cost=cost;
         this.cost_Destination=cost_Destination;
 
     }
     
     @Override
     public double getTotalCost() {
-        return this.cost_Destination+this.cost;
+        return this.cost_Destination+super.getRealCost();
     }
 
-
-    public double getCost_Destination() {
-        return cost_Destination;
-    }
-
-
-
     
 }
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 79af93eb122d5e940649e398d85f0dae5df10740..f921f086daecec27af8ed9f04aa1be651f443b03 100644
GIT binary patch
literal 3094
zcmb_e+jA3D9R5xlvgvlASfJ%51Vv3LZBQ<Srj&-pVkKZTSj77_*(OVq-MHBx^{(Tq
zKKtOG;Dh=Q7@6_GNB<_r@jGXe(qy|DM<+9z-E)4I?|1vo`Tfsdeg$w2UuhT+IPZGp
zwCyy^blEfOl}6gEmR-;GE46f^;(ET-@av{uNoNbb>18{68e#$$`&7-@cQ+coXKrZ=
z#OG|s_U8rWQu#iu6xwK3h$d(HW@chlAhzh1EFFUwGO!DAfswrJST~!sHOsqYu2n68
z(Y#wUtE;AG%kTDL%&*uDfth}tcSoP0;}RhVT<X_A2))4WMb9#Q+ja8hnpG9p45y;T
z=&I?Pd}i`@&3k6LYC7d~&TTT1OvrU0o%M>DiO^m|Rh8?E4uO3J_TzwnQMUYLr{45s
zjs-HQzHNm<)G#h^rqA*!B(leJ9KsO|hXwZbhHT&{o)j1^sRXQ=)h6pZn3~AxIF1t<
zlB{T-?s~x*cnVJoBpCfQIR^sAcZfX5uo7U>p22e(o)tLU>+^Bh45Tn2uuCSjq_8gQ
zn8cKZ(*j3!)>GyUOe0MNDoQBJ;VL|KqM$r);02rwB3N;4N2x_=DFLb-$9V%6Fe9*s
zj&huJ+fgkka4a%>)s8wYA){e7G79Cwz#J|UQ^{`lrc-3KE=M(a04dbBL6pI!tn(PI
z$Vp$=kvX=dBo|>xPDf5Mhqy0rG(t#4$QduXO{Q@)JbEOsy6IUm$wwk=NJpIUPM@t>
zp1m&cZ8-dh$?Pafx+}QVrX-3s3Gls|&U&7?nP*<ZJkW>5Edm`X*kzWy>9ICH{QuzQ
zBC?}0JpW&y>&WA#h8vONClhDj6|AsEMai_*_LMGpZcT#VA#gn$cF;({oCnocIale9
zoGJRt4B<80(opCkufk@-w`vAn2m5YN_0)mDs_mv%JkDytC%_u#=?#JL$E?R?+bLgd
z+SQWfCGaM#Hrl6PQXb05*`$u!cw0`yI|2t%+d4JS<sm5(^`3$EK{g-al;<s{?33Tf
zn@du=XrKgEKW^6RmP3*{np&C&8ES(dXWT~FKm|6(+IIsl0{h7py|^j6ftm&$ZTr+-
zceDl^30kYm1XLXzb$A*+;E~fyi+%KSXF?1#z@gL_r>y_q(U{!NByf-PTD6kJidD0n
zWR^VTCCP(Hu61(FNE_`5B!PuG`d`44jL<RF?!I;>^vpE*sUFQw3cA2p_swRr-nreJ
z4QkPC^B+c0a+PluH*T2q_8mztxJ|EUE!pxGwXgdIG%X8?6TCMJ@-7KJdB`Eor^c^&
z4DbiUPfb2R;wQchK<86et2!lz`2)#ZNx{Hweo-EKFhU#bb3D<u^)(Wd2c}Q8FghE1
zgt0r5r&~BUbtu-tvB?%rw!p13^79=3AL8Nz%>PJ@?LJ3nd$00&F0i)ca~fG(r7wEG
zB614RG+x9KV~X?imWX29zlN8%x2){GtfKsl>k`?*6oH(6i0iYlpYiG=+`cn<=K<c5
zfZlCkt%da#?y4`Mb-B3y&B%A(W0=CDO>W8j#8iI9l)W*&kK-f`Vun|tE4=f_Tm`rn
zws0@tL)=%m7qE$s6z&Cuc98lP@G(B2)laEuY)O4asn5BRfcOJfG!lcr7yKT;mwy2d
CD~=QZ

delta 259
zcmXAh&n^RD6vcnv%r{2A4sArJMM(_W>6H32HI$7fAQlpjU_&I`SV=5cPj2EBY}pJU
z@c{OgwjM)VwYle<d;Z)vKCAVQpVxOFV=u%r^oyePls|ZK>^J>IV)^oWm1SBXD~7x%
z@*tv3BGWdL8-KwaU7Vc{Bi882r9E^T5doWq{k9y0vr>0~eA_!oT-SJV;?kg^zLQ&*
zTwgJ+9O6#N)WE(mbDDNb8mno^{G2UWQhcHF%=)9oJe*#q2$PIaqpB?XpCDpFm5#Bc
bKQm%|wnyohoE?1aG__g7s=xc!^BDXBsnaO^

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 93981dc2009333fb5c8e62045e40a2c7d52c05c5..ebf886bcd029f37bcc1182e7645df3d2b091efd4 100644
GIT binary patch
delta 973
zcmX|<NlX)A6vzMXE7R#RL#HT35Vb5~1q>#j7(oPsOAHzl5)+LcCb5*7T1Xj9@PhH?
z0mOV451zd00VJtAi81k@2lo{fS8!i($K}nGc$x3}-tvFH_ulMVxWC%C_~+CxfEt>m
zLJ*e7BL6&DPr<=8aepD<iiWGWM$lW^J5pA(%i0)C#oGvd5&2PHmfN!3++|knwBm`X
zrc}!8Zi#nUb?m7*aLGILTrZ=c>OdW3dt2kNq-pI;MF~fpOt~&lCI@u4y1rvuw64L)
z2{xOSSvP;94;S!S!yCMnC;f@A7w_>=#Rr1nR7;r2SXFCxmlfTi;S)Z~gchbRvR5nI
z@{MD<ra;4;rqv!^8unoVKQt)#Nyv?4fHM+SDxQo@)tl7t8-EDiSk!8XCSz7R!4;Xm
zin9qC5ecd2<(>)3(nuk<tkp|Y@{ms@uQc_%8RWP1)lQbQ5=kG1N!KWw0<vGP6cm)h
z`aD6M^0Fw9VNH<<V-bbqVWXaA%2A_<6j>BJ>)ikk{D5c~8V{}zq4LUnPemG+D+hQ%
zS@7}q78c39)35fdMVlRo!!Yc4Xwdnkh}FnO01P5l;yP|XAS4#!Cg-^@M=Zc?++n4N
zD8*g2DOiaWn1$JJV=L?3!w3`XX06O^5TooJVebfz;693>;ye2AU>h5}<i;L6<Paa7
zK|da`O%*zp<1tHnM2RC<3@@HAS~-`^pgjGL^6Wp#b4Jf(jxoSEKn*a4Hizn|hnwLa
zkQ;fyDgrMV0XWZ@3ZG32(x|9Bfmchjj^W*DOl->edK};Lv(osL#@{r#(xf`CiZp3#
zZ0ijiJOqt{r;)+FK^DnOHslB<c*;9aiX>{$fkvcyoH5sAs!ffV>pH_Fo51N-I5&Ir
zE*7Yz9Gb?mcHbKFXQIZKo;&0IXcCPoE*Q-yq3QOr*gBU_J5ni6Q?9*l;q2QTajfJ}
X*i{7OIo}zS&!>;Q=cs@R8}t7G4>8)h

delta 819
zcmYk3OH5Ni6o&sZrM<nkw{TmY<)KBQv^<2Ui3*q)qSXZ$6B7dwNg62yh0>J91UC>9
z6E#5=vvHwIS8l{6)%YNB!@>;$Dk?>M;`{x=7kVy{#AGsa&Oc|q`OnPI+GEwm^@U3#
z0M=1~0zudyiyfu1j$FgrJ012>+|V(O2|19_wN1k)ZtA#&2}1t9SST0|1%kctP;Y!^
zFy0Y}^>pv(X$$qLn8IBJcL>J*;K5*3S1=N;+SSK}-8$}JTIz<EW@M#N*fPsCy&XL<
zli`gr#9QOlkitV9Ry-nP`x^d3#ABV2aIJs0>Enrxr<fzC;ZVFG6bZ*W2o|3|V4i-i
z;{{&IGe(&`h1WXX;H{i8N))`uM+F}wxpMRH$>b|hM#j4$8b<I%$5(ul)vgMG@3PfZ
znrP8ik)Ws?6Zx9iVJ$&K*CYm<o5-@-=a<9I0(n|9Y_%GQvSi9tm*ydq@dM_Yx(v9p
zC{6BhUsY#dhXW8piQ>$9(OjNHxyODHV>RkhI9a2e$L-5VHM{R$zypt(#N#BMCGjeW
zcZ*p?5}#RYAIvy;3JxxI&+}HrIsUseXgtqhqwLEb?{7p%G@)I@5Ee(!AqH{4yc|im
zO$*TB<jg9LBOMvwM-WHx13w{<Bl_?QzhS|05yb-jFxe-<1lFwBih2}b8En`K2N4Nw
z>JXg&qG8OUh&5Y3rg4@mSOEp|I6-MFs$|0eS$Wpz3MNTmO%YBUCOf0;qQnI92~{+r
zo>bB}YQlPQaHNsWcFWkxqCIjh*`xF&dz8WLEYiq;Y9|*!ZEz(jbL+_Z2d!{OS6-%1
xfm?xJ!6*;F*n$#roBcC>C9m8jtYt~clr5gZ+-%MS<xnoK{J*$Hd6d7|^B4MAzVHA5