From b48d1f16ecf8baa22b84401aacfc7380b83ef79e Mon Sep 17 00:00:00 2001
From: Nabzzz <n.moukhlis@gmail.com>
Date: Sun, 3 May 2020 12:18:39 +0200
Subject: [PATCH] Etape 5 terminee

---
 .../shortestpath/AStarAlgorithm.java          |  33 +++++++++++++-
 .../shortestpath/DijkstraAlgorithm.java       |  41 ++++++++++++++----
 .../graphs/algorithm/shortestpath/Label.java  |  26 +++++++++--
 .../algorithm/shortestpath/LabelStar.java     |  35 +++++++++++++++
 .../shortestpath/AStarAlgorithm.class         | Bin 524 -> 2731 bytes
 .../shortestpath/DijkstraAlgorithm.class      | Bin 6655 -> 7043 bytes
 .../graphs/algorithm/shortestpath/Label.class | Bin 1736 -> 1947 bytes
 7 files changed, 121 insertions(+), 14 deletions(-)
 create mode 100644 be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java

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 fd172f0..5182549 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,9 +1,38 @@
 package org.insa.graphs.algorithm.shortestpath;
 
-public class AStarAlgorithm extends DijkstraAlgorithm {
+import org.insa.graphs.model.Graph;
+import org.insa.graphs.model.Node;
+import org.insa.graphs.model.Point;
+import org.insa.graphs.algorithm.AbstractInputData.Mode;
 
+public class AStarAlgorithm extends DijkstraAlgorithm {
+	
     public AStarAlgorithm(ShortestPathData data) {
         super(data);
     }
-
+    
+    @Override protected void init(Label[] tabLabel, ShortestPathData data)
+	{	double maxspeed=data.getMaximumSpeed();
+		System.out.println("Max speed avant: "+maxspeed+"\n");
+		if(maxspeed==-1)
+		{
+			maxspeed=(data.getGraph().getGraphInformation().getMaximumSpeed());
+			//System.out.println("Max speed 2: "+maxspeed+"\n");
+			maxspeed=maxspeed/3.6;
+		}
+		System.out.println("Max speed 3: "+maxspeed+"\n");
+    	if(data.getMode()==Mode.LENGTH)
+		{
+			maxspeed=1.0;
+		}
+    	System.out.println("Max speed 4: "+maxspeed+"\n");
+		//Initialization 
+        for(Node n: data.getGraph().getNodes())
+        {
+        	tabLabel[n.getId()]=new LabelStar(n,Point.distance(n.getPoint(),data.getDestination().getPoint())/maxspeed);
+        }
+        //tabLabel[data.getOrigin().getId()].setCout(Point.distance(data.getOrigin().getPoint(),data.getDestination().getPoint())/maxspeed);
+		
+	}
+    
 }
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 db622ca..fc99775 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
@@ -16,7 +16,21 @@ import org.insa.graphs.model.Graph;
 import org.insa.graphs.model.Node;
 import org.insa.graphs.model.Path;
 public class DijkstraAlgorithm extends ShortestPathAlgorithm {
-
+	
+	
+	protected void init(Label[] tabLabel, ShortestPathData data)
+	{
+		
+		//Initialization 
+        for(Node n:data.getGraph().getNodes())
+        {
+        	tabLabel[n.getId()]=new Label(n);
+        }
+        //tabLabel[data.getOrigin().getId()].setCout(0);
+		
+	}
+	
+	
     public DijkstraAlgorithm(ShortestPathData data) {
         super(data);
     }
@@ -28,12 +42,14 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         Graph graph = data.getGraph();
         final int nbNodes=graph.size();
         BinaryHeap<Label> tas=new BinaryHeap<Label>();
+        double coutPrec=0.0;
         Label []tabLabel=new Label[nbNodes];
+        init(tabLabel, data);
         //Initialization 
-        for(Node n:graph.getNodes())
+        /*for(Node n:graph.getNodes())
         {
         	tabLabel[n.getId()]=new Label(n);
-        }
+        }*/
         tabLabel[data.getOrigin().getId()].setCout(0);
         tas.insert(tabLabel[data.getOrigin().getId()]);
         this.notifyOriginProcessed(data.getOrigin());
@@ -54,7 +70,14 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         	}
         	tabLabel[X.getId()].setMarque(true);
         	this.notifyNodeMarked(X);
-        	System.out.println("Coût: "+tas.findMin().getCout()+"\n");
+        	
+        	if(tabLabel[X.getId()].getCoutTotal()<coutPrec)
+        	{
+        		System.out.println("Problème! Les coûts ne sont pas croissants \n");
+        		System.out.println("Coût: "+tabLabel[X.getId()].getCoutTotal()+"\n");
+        		System.out.println("Coût précédent: "+ coutPrec +"\n");
+        	}
+        	coutPrec=tabLabel[X.getId()].getCoutTotal();
         	//nbMarque++;
         	try
 			{
@@ -89,7 +112,7 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         	}
         	if(nbSuccesseurs==X.getNumberOfSuccessors())
         	{
-        		System.out.println("Nombre de successeurs OK \n");
+        		//System.out.println("Nombre de successeurs OK \n");
         	}
         	else
         	{
@@ -124,14 +147,14 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
         }
         if(p.getLength()==cout_total)
         {
-        	System.out.println("La longueur du plus court chemin est la même que celle calculée grâce à Dijkstra \n");
+        	System.out.println("La longueur du plus court chemin est la même que celle calculée grâce à l'algo \n");
         }
         else
         {
         	
-        	System.out.println("ERREUR: La longueur du plus court chemin n'est la même que celle calculée grâce à Dijkstra \n");
-        	System.out.println("Cout Dijktra="+cout_total);
-        	System.out.println("Cout Dijktra="+p.getLength());
+        	System.out.println("ERREUR: La longueur du plus court chemin n'est la même que celle calculée grâce à l'algo \n");
+        	System.out.println("Cout pcc="+cout_total);
+        	System.out.println("Cout algo="+p.getLength());
         }
         /*noeuds.add(data.getDestination());
         
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 5b95e8b..5b0d2cd 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
@@ -47,13 +47,24 @@ public class Label implements java.lang.Comparable<Label>{
 	
 	public int compareTo(Label B)
 	{
-		if(this.getCout()<B.getCout())
+		if(this.getCoutTotal()<B.getCoutTotal())
 		{
 			return -1;
 		}
-		else if(this.getCout()==B.getCout())
+		else if(this.getCoutTotal()==B.getCoutTotal())
 		{
-			return 0;
+			if(this.getCoutEstime()<B.getCoutEstime())
+			{
+				return -1;
+			}
+			else if(this.getCoutEstime()>B.getCoutEstime())
+			{
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
 		}
 		else
 		{
@@ -65,4 +76,13 @@ public class Label implements java.lang.Comparable<Label>{
 		this.cout = cout;
 	}
 	
+	public double getCoutEstime()
+	{
+		return 0;
+	}
+	
+	public double getCoutTotal()
+	{
+		return cout+this.getCoutEstime();
+	}
 }
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
new file mode 100644
index 0000000..599e707
--- /dev/null
+++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/LabelStar.java
@@ -0,0 +1,35 @@
+package org.insa.graphs.algorithm.shortestpath;
+
+import org.insa.graphs.model.Node;
+
+public class LabelStar extends Label{
+	private double coutestime;
+	
+	public LabelStar(Node sommetcourant, double coutestime)
+	{
+		super(sommetcourant);
+		this.coutestime=coutestime;
+	}
+	
+
+	public double getCoutEstime()
+	{
+		return this.coutestime;
+	}
+	
+	public double getCoutTotal()
+	{
+		return super.getCout()+this.coutestime;
+	}
+	
+	public void setCoutEstime(double coutestime)
+	{
+		this.coutestime=coutestime;
+	}
+	
+
+}
+	
+	
+	
+	
\ No newline at end of file
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 29e0f95a537800ab049f175ab0bb56215d560daf..54d645dd31575f0d2575ff140879184f357b0311 100644
GIT binary patch
literal 2731
zcmbVNTXz#x6#h;xnKlfRwiGDWqJRknf>1yjs4av`FfG+!74gDJGBndBGjZkwi;AeI
z^{#KO)gPeG`Vd6cQeNc2h5yAL;1a(x>4i3JsU|CvnK^rZd+%@G{`lvYUjg*sTLX0h
zhh1+pW;?!&je4?__hYg!>Uy@y7h`_j^_1nSl2rNFKw3#}VCKv~gTON@R881p<G%9b
zthPYtxb4`gPvCeYwL+Biv^T@_CLxuKM@Ix2PPsWNjCwSiXhcY$C1pF-P`Q|~yo)kZ
zumsvtZdMjXq-X2r>6Z;EZ~FpAS89BI^l=)_(FK8HD+Q?Wo)DS>f$_-Ym4c*X#wx^D
zDqUkTIub@ZIt;91<o}a(6YH^oG>=+pP)^vzaxq=9teil7B${kSCpH_{B(Qc&UX!tc
zbVg(8>%OvzCbnQJrQ9+@?nnj4wi_GvY)7S)XUSsRz;=NRk0>f0j-D*rg`DLzVTV8~
zO?LU(UKimV)!P-uHaw|QzmuquDs0tipv)T461z=2g$S!omP(dGXSYNW(Hh}tOYtV`
z5fEXmxK}Ig6WF&H^pXHtGiKrdo)&0QF2iFS0_!5RHsfI&!eIkF0_}@%V&aI7%qVG^
z3Qp*^zu39_=sfnCh~qddFcoKY>k4eAg@t)7vOx;5K!C>j&~M;bfz8W^nHa!H`ZI%@
zbgsHyQ7YSY1ft8E;E+(Zuk5T(V+mbrrv-K`V{A?#)Nek}pFf+B6j(i%>O(rs?Rd^a
z3WFp=mmY%>=vl;<x#=~K(K9Ejl1{0t^uXAuwc^dVfaeVi3mjPJ*5h<dynr;TD0O=1
z?8S2e2W!ZF90F_W#d)#y=-B%3l8KjbshZ0nddbn$Hd8HSWfx*8k{Vxy%XrPes{(6+
zTA4jD@jBk1wyi8rD%TTOKTkV3{hkOCSpylu&mqj5n#h5yHaOM<dvt!aUdW7DS;ZD*
z9dBC5TeZZr-(g&ZZDLH1h(_iqnKMvWmg#vrCYWz}&uARSgo{#@lVO+jzg&F>0xY?9
zcqV*Mb`8xZxV&s<x^lNIQY~|yQ}-Gs47{~uZv-YxT*uq=DaU+BCri3c)Gn|pYSpEh
z5_$A6nh0YY@9Oz=L!fIZB+YC*5gpOlyJ_Nme84WqOMfUx6bJ7s^hn7}K%YSDKkgGM
z7v)4SRyp?){ISosEa7<I3rm<;%8n1pQm{`A+!6?<-LjXp&e(eCw$ERf`*pPmm`TU6
zyi*0~`<8FuYk}^CwX{qJu`~zC1a^RXBp8EryyMpA)!=g<>i7jhd%AC<=||qxaZu`E
zso$=mq{%C|zyc{gt>zQuu?8)~Xuw*uR<Xo5ngh)Hdn;(0JpU6m-o>^{ZC$tVM6`lk
zZM<|>u)l(X(RDcb-4r?~c&vgG6`Yzp&v$3sS*3HeN)+bt(D!I;nH9UZs2DLv?tlsI
z4gG)vouNCpB5)5^dmFnu8!O1)#rUPpMtxf(=$rie8Re*Z8}FpG@OuJN4<BeQ>H{v0
z1TnWT=C$Op6;XD~VRUelY`_RM;tDn)!&QBQD{Kl~VAS{>I|JT&$RKckmbd%(5Vy#e
zey16%BkDbTgpX-!is+wUk{X}#d@CCMM!bIaLv$l#Kp6PUKzltImcU*reomn}e1R|d
OA134le1&iNJO2gGoCbpc

delta 69
zcmZ22+QTAn>ff$?3=9k=3_|P-OpFYs6DO)~G!J5&9KoT;!=T8($iNJgWnf^Oe1=1t
Xm5qUwfqn8H4p~k{1_7Wb6N4ZCC!q{_

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 48333f332c8d39af83a9bda9f3f78ee1482f2309..25eb4faf62161baf9dfd159f75722a71812868d7 100644
GIT binary patch
literal 7043
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
Lv<QpiP73`G41~C(

literal 6655
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
EAB5pk`v3p{

diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Label.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Label.class
index 9815170c2b3bf78101641d8f1efd31996384a64f..71cddceaef2d79d464e3f41da489c8cd6df37ef8 100644
GIT binary patch
delta 436
zcmYjNJxjw-6g@9rn3$xx2-PkQ)tYt?4WcoAw6%88K@fM5B7)MvIQK_nQ2hD@0g*}v
z5pk3*j{Y0*yu?ZZxi9aWd(OExpUz#u8veY#1Mty)wuVYAz_NgS+KHOotLU&B9iLke
z2yJXg!ucawm(kfpC;nCzMI#<l`@-(Osg`2iLW4rLApX*ey;*O7^(x<+d+16sx?Mj)
z*Ag|+5_YO6v(CX}U4qRyT&!RktHc6S5E9uW(jd|%225oMm?tZrfP95BZt>fI<`x~n
z+YCzano;iULC1bhXZ-67j5AO6ay8aT>TC2CJQepz)^s)_MGjIA*)Q=dTQGa1^trj@
zEbj%r-1H=M2y+%kISVVZn5c8LZ3<=h0*&R*Grj5u!~pg9!6+4)Y2Xf8>ACw0-%UA$

delta 232
zcmXwz%MQU{5QWeG|1Hs=Y$Ry9bKkf{8kf>~9Sd*Z9dtqHBXlE@F1ip)@g81791V+^
zIWu$e&793g!Faxt8-Ov^7vm|_5Tm{73pW_3t1zxFWyswI8YDe-H-^(=97E_b`geyD
zbQNh49SRNR3UuZn@}w3qK@AQp%+XADDG4pK*^!AUmB5UeSBeGdI^6<gPFxaI5N4{n
mN2VVn8OtttM9zPP4j=mhbKTw@BE}-vW-W8ciNp$CTKx|f86mv@