From 72ee91ff740bb612e3475eb7ed93e238cc5efba3 Mon Sep 17 00:00:00 2001
From: Bafo <fofana@insa-toulouse.fr>
Date: Mon, 15 May 2023 10:34:32 +0200
Subject: [PATCH] dijkstra add test road allowed

---
 .../shortestpath/DijkstraAlgorithm.java       |   5 +++++
 .../shortestpath/DijkstraAlgorithm.class      | Bin 4662 -> 4740 bytes
 2 files changed, 5 insertions(+)

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 e50512b..267c777 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
@@ -50,6 +50,11 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm {
             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;
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 d99e4d5e448a5b2cee67d690b22860ebe67b5590..fa3a594286c896f15136086f8d86d5d906ce4190 100644
GIT binary patch
delta 1316
zcmZXTX>3$g6vuz3oq2EG@LD>Fg+4TGWl0N_R3Zorg|r>&Lac~lYF$X0cGA=gGo>>H
zS+qrQVG)$8LJNqvP_$ZE^s$sp1c9o!?-~<AV&XTy`9ZDsJ(_~?%YFC!|M&dQ|Gaar
zJATcCyn%m?90#WIqe+%9Ly29YDkQS+w%>!J9hTU%kru3$bX6jeS{82-3e^IupsuQ|
zan{89!z5|9SxU8#+Z@l#ji)m$$%afzDj6omBR0!fD1=(lwGC}c+T&qX@~FuwA@Xp;
z(uVRxL$bNNI+aSq8<IAU(V<owCF54xJkAq>sTE_XbVkT7oj5m)!;>EK)R2c<--E_i
z@{G+|^@ow~thd>~gM!f(Uz}R1>&4h;vx(<ak(qC7wo$yGqUIFiC7Ug5RZGlhQG1vY
zw%Kg=teP$9n#HY|<zD8?HamGm4VX6?uiDJ#wauZTal6@L(j(;i4YX%k66LW}A`x%&
znoiri$y=&AG&b<IFw6g&onotPp|I7*UXyo)DH<K4Y-@DTW*__2rBJoJr~b-zRHbEv
z4&d4ZIjHWmrrEt5_JSkA`ck!PM5*eO$boa##Vq+s_1YDI?}bT2YI!O@CuyxB#0Zc}
zYD3O$8BjOnmUL`&LWh|yoFo}F%N*0CwHu>{&dJ_B<1)|X-jl?lmSedr>!vyT5G$f#
z$8hQN&#!6pn9i-+u>zN=u*=h3%<<uCsM*p**a>*iI>)*?&*j;U%S62<bh+mz4HbRS
zbG1O|9&DOi=F&B6!?!TP3Al834Ho~Gi<&)*b%LJ64wqeZeg}H@`fzsC^vSb>KRdxg
zywOkZ`1-Q_ywlHtdR?Z#2_EGAgB+^8VXwaS0m6FiqfE7qoZoRXmzd6PMER3h0u^E~
zTdrk}Tu-G;q)Mg{lL~62mRn>Yx5@+DE=^38B;~S>yQG`DWe4}j9(|LJ>iucz<UIGu
zMe4n=u#sGEIN0RqC@8<`cqIDL$uIPGaFi@Y$pwyaoNS8Z3@7x|0+ed84>T5}hH6gn
zAqEd=!PA`4^IoCFF7Ni~%u^aO_=&ZA#92(;N`iA5vvf0yIL`oKZF3$UYs};mZKGJ%
z@~Yl(j8BKlUKlR>nJ)Xec3nWuATtS>h>2s;Yck5DM6X(B1`IOgDpE<LP<mBy<T}01
zjug~hId1BgHIy+L>;H0^H%a;@{${2htsFC`pXimdYG<TK>z;@>i>~Nu(HIow%_Wa7
uyq~Ijo1njXk_0EYeCbU*%b&R6gW}I5%SXTV*Khb%f5V#X<2!z+bp8cUlQQZ6

delta 1170
zcmZXTTToS17{`AL&e`ki%|gHw*@)s;&H>R8W;FEZILc+Fv5+y%V#b`ohH)t5aFs9>
zD!XbFu1Y~n?ZPp;2vQr6B-F~Xt65Gn^;EAt_SA!?wGVZ&>1D0;{r}(h|9{_FdmmWj
z-Qirld43XD&W&NGz_J=?R<!7-HOFmJw6jGJs&B2TZE0?=bLgN`@~A#xWvA}pF+FC5
z7wl8)r%NDr*0q&KTiXPw1%(w3E|2@n6FP3)Ufsa~#Z$hR+7XR5)YUd_t!?lH!#tyS
zmTdy7rEXVrw}HxeUU85^MzZxE$v{Cx;Z~pOQM|}Yx>=T3hZUNa^=TQ&Z}x?bD31CL
zvc9!)S5sT3pWd%H#()-~V(T?UH79gwDBpUWHzjZAZK2%Mw;0r&p@o6dg4Mm5Vcjj%
zZJVPF?QQkZMw>IdD|tsya@Z*eD&FILJ=ZQ1LwdWNpLUjWiXbC`V%;rs^hrBc#rV+2
zJi);NJ*?*Hrj&UjH|^h2#JBoawMP7)^V5&nb%aO*@sqxsJ}4&j!!yENhuqLOrGhCM
zBXX%LJ(@f=c-%KddBk>YkJf&6rjD^Y;<%Q_-XcGz`yrp%dvpLhFiklgPxi4k0neiH
zNFR<H@S~?)`_?*-=ce%*gG;ZA7Z(3*+Us|+Nzfl}T3Y1sO0tba3u$h^<JG?SlK*lM
z8DpUv^d<T{j^Ce{z?@Ddt0OW&UWxzW2FExxL9C|e9B)r>w#K;R<ha36hDZ6JYRQoK
z90NFJ9i&i?WK?&p;CJri4@&uyl_G;xVm7PAJl2Rp){0`*iS?`(cTpy)sSppaT<l<(
z*w5Xfhbqy_MlnFO7&7NE?iCl<EN-yHe*$`#;Xee5bQ1-|brWY`J|c0AQN~CiTU_d5
zob#lTFUFbRBhy@g5xZcpAeEFc$;VhcXauLYXx?^@5t}{@Gi=z4hW(j+T;ej)jMBg-
z2D8mD+xe8wa7>#UxMDEL=cbJX#>?0m*Dn&TVc+&@()LSZ`<3Z>HY(04LJ}cyB{97$
zD^JAqJz4Y3`bbt@ZcLIb37Zw-<`=R5O+A%0Yegk#Ng$aiDVH=#RwfP|ko*5iWn(2P
zb^1)V=oTka2lF#4$mDDPCe1*L%r5-<UF`9V-ZV3B&UYqC;TqqY-7(x5uJhwM_b;GI
B6aD}I