From f2c643c9522234d417788cb0153ef4b8b9549a20 Mon Sep 17 00:00:00 2001 From: Bensouda Idriss Date: Wed, 19 Apr 2023 13:41:35 +0200 Subject: [PATCH] getset --- .../shortestpath/DijkstraAlgorithm.java | 10 +++++----- .../shortestpath/DijkstraAlgorithm.class | Bin 1850 -> 5045 bytes 2 files changed, 5 insertions(+), 5 deletions(-) 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 d966e9a..415c6fd 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 @@ -36,13 +36,13 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { Label x; while (MarqueExiste(List)){ x = Tas.findMin(); - x.marque = true; + x.setMarque(true); Tas.deleteMin(); - for(Arc suivant : x.sommet.getSuccessors()){ + for(Arc suivant : x.getSommet().getSuccessors()){ Node y = suivant.getDestination(); for (Label l : List){ if (l.getSommet()==y){ - if(!l.marque){ + if(!l.isMarque()){ double cout = l.getCost(); System.out.println("c = " + cout); l.setCost(Math.min(l.getCost(), x.getCost()+suivant.getLength())); @@ -55,9 +55,9 @@ public class DijkstraAlgorithm extends ShortestPathAlgorithm { arcs.remove(i-1); } Tas.insert(l); - l.parent = suivant; + l.setParent(suivant); arcs.add(suivant); - l.marque = true; + l.setMarque(true); } } } 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 925c894cb28b05c8ddfba3113ad4392778405672..cc2206986bfa7fa80b3edb5b24e1db3cf5b32bc0 100644 GIT binary patch literal 5045 zcmbVQYj_-08GcW?yR+F$(puUy+mv1?rMWa++G0pIX(7$FG?Ju+#MV?qCz~Oec5j`T ztqop+f)(VZR)JO!MI?w-q1Fv0EmlR8swkjB74d>q)JJ(99)I|&@jbJ<$!0fON|PtM zGv~X1-}`;%oSZ!K)YAYi!#@?22sFjbfq)USw7`I=B?hg478!_}hCLV!Sc7rX)-5}s z*@JM4z!VQnW%nl=_cO|2Jy4j=kMRbAL9r3Uh*`}F>e9tVp>_Nj42%f9)f+RH4c0auk zSbMHIa#P_1AmHwgUz>~xTv1bdK3cltk)&Jz9WvB7s)Z)P_0?%l4rXewp$40yAoAw<%a4P*=Q=QrZe^Fk+fHv{}~@ zK2*c+!y+tEuvp;o;*wLKn4duv7h$P@ml0njF)XlXnrNehNF?AeFj32}T)`y*)%iAa z*i_V@Hm$dd!UW1}>YdDkOhI!Q>d~NJg+Rqrii(v8P};C{Q?uiyK;;za_RKmptil=v ztEqlcLzb$tQQu9F#q_r{LI*HhCCMy$V6x?eS=pg984@P|}r=wrMz+^LznlN@8N znjLA={VH^+tCXnLZJpYr$bgE$Y>K+$(WuTIZNyF$yCjm!8EJPi9M&x>ZdwYWbT}Uu z6J_%ug1Cx=R98X45O)H0t{gNndkxZ@rNWlA@)}m!LAkg`#fPz%QBo+KFJ?SciW~7! z1s@TZ<)GZja`%vB>roXS!^c^Ncv99OjSC|l*lHRvyW2K(ElP~vBrq>W&?a$UL(+)! z>!ufx z+g03wI~k`PPZRT7F{9syyYV>%pUsZTsZpr-ymU-S$iO1ZVgz4M@kQK|hIEG>8?ZUN zn5|7d+=qh-4rHf_ldVo}o+`eC`^giP=yBJCLbV|;zRd6=4Bv~d@M*7;h)O)9;%gH3 zF3Y%4_u}i6(#)`|-H3`uCGtI{9*yte#@U3&RD2VM(pcN7nR<++SXiv%vrR4VZ57|a z@!dEq^YGog0%c~I+(W*{S(A^-BGW2&C&=!Cr5MFg z1y2gBDz2rq&*E7oY-fco?zS~MNjN`+F;-~H)}Hpx)((L+1!HZ}lOj5Z)#F9yu{{6y za17s)X|WWi_o@8NMz;PD{7?%2NZ|HD;Ysh#x??t6Qfn~5AiQTx5CcU6CoZCrk+rT64_Jg#vB+-oV{8K z)SuPE^|X22Sw!+Pb{^_ipPQSLS&%-Jv+=^aI<-XRL|)o$3~-Z4nw%n=r=242*t1%0 z(5{GsD36{QP=aeKr#U)I<}kmzox}C(DrVtb0>18e(hTdH40*GtEVvb{lp7U?VtXv6 zn{5%zvUKjYZ=CgPoNtfQIX#oG1cW?qY=DbTyx#Cr;oEwY@E7pZ)sMpa1fNRad8pMC=QoJdN&M{Q>j-sk-4AuO;FzCuG z1l{#1EKK3zqp0J(Ng2U1zj73p3Y zX~ujc=#}PTL0>}(yMyWo-tem#T2rvhUq(s4?-9HxpUi_eDZi6z%MW8{48y&%KQW4% ztIAW@m%?XKxXbTIB&ETm)Vu%A@RPWg9%uOCAs_@rXKR;admKjM0iT`NSBG^wu9nY7EDE>sdp;dlXNP;s>289w#PT4ssqt z9iQhAIdh4yDk8$q&-p~)0-|jpkI{?J!{_U{lHjH5W-P@%UZrlsCD@PUIKT_jgQ&%E z>UoCuqElFb*U^A~@hbEdFGHmS%0*ZuT6o#nhBZRNWnvevHx?Sj9lXWd!<)(j1kb~0 z7KhLx4x?Ti~`WpbP>iKgy}U7i0a5k)f3~f9Q7uO~(ct(YM|lbU>U^HY-}o*6oimER;~!W0{|}eKVO0PC literal 1850 zcmbVMYi|=r6g}gtv&ph)LP8v%0hR)-9VcE2X$x^4jhdh$ob=%k3BHZ(!JcHj>&}iN z_$&MYzVM-yszhz2wx9by_!|v(*3JV3ffKE?JCC#Ho;mm4`S1Tf{{}FNZ*8O)?nSEZ z%P{7CUGY{U_IXf`l+=x;A2%YUMXXy~H~ba3wH<54mk+jWSPb(${$1`;{YX@Y3=IAA zGL(9ec(SE4Fs*RSi@8k(>$|8X9Q0w(MH>AK!zCGt^>(u&)CR8vf?>22Re7+2z8N-0oLUA1_h76U&5%6Jmy?72c@wts#RM#hWU3`Ho6=o=&YlaI43`t4+ zP}veyO_egmFx_LzCF&jIFzsRn1*0$SxX93#%{?_@ZoBx>Y}pMSuP1S>fQ+O(9Fu?K zFSWktW`L2^EMO>{&P=lA-Hv|II_T=v_k}!lt{8^Onpd~ic&mF`6h7FV%N27yR`p>w zI$&6EF@p09PC06;s(2vHRg^h#jTB50Dfi?jUCn?+Bf7`vZPRQKDSCkZsr()Wexp$e z4!xaZb(oMNI7jnL2L%^HG$TAd!7y=HMnjitmLf3PbN<5UlhF%%$oxaI4xfn!svX1S zc2Hd|hD*3is818@WTNVKLZoS)?_0?4;>w)$3KN&CKX8NLU*y(jc9DOHw6$Q?e1@0% zZzf+8+)AWhCUL+cqAZc@HC(|uuF*J$pOWxXgd^(1qvUZ1cPU_s5VQD-z8MVSYkWh; zxkt#3T!Xq#s5x30M{1v_(l(fltH#Kiz}UzNc~K;Y@%0vc&56@fyO{r#2FGn+i4J2s JqXd|}rMJnS^1J{5