From 42cc65183454233649e1e88cc3d6ef59be52b00c Mon Sep 17 00:00:00 2001 From: Pellerin Tiphaine Date: Fri, 29 May 2026 17:55:04 +0200 Subject: [PATCH] =?UTF-8?q?am=C3=A9lioration=20de=20l'algo=20en=20lien=20a?= =?UTF-8?q?vec=20le=20probl=C3=A8me=20ouvert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../algorithm/shortestpath/Marathon.java | 10 +++++----- .../algorithm/shortestpath/Marathon.class | Bin 1313 -> 5390 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java index 01c1652..7771b80 100644 --- a/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java +++ b/be-graphes-algos/src/main/java/org/insa/graphs/algorithm/shortestpath/Marathon.java @@ -47,8 +47,8 @@ public class Marathon extends ShortestPathAlgorithm { Node dest = dataInput.getOrigin().getSuccessors().get(0).getDestination() ; Label xl = tas.findMin(); - boolean possible = True ; - boolean fini = False ; + boolean possible = true ; + boolean fini = false ; // iterations while (!tas.isEmpty() && fini && possible) { @@ -56,7 +56,7 @@ public class Marathon extends ShortestPathAlgorithm { Node x = xl.getSommetCourant(); notifyNodeMarked(x); xl.marque = true; - possible = False ; + possible = false ; for (Arc a : x.getSuccessors()) { if (dataInput.isAllowed(a)) { Node n = a.getDestination(); @@ -64,8 +64,8 @@ public class Marathon extends ShortestPathAlgorithm { listLabel[n.getId()] = newLabelMarathon(n); } if (!listLabel[n.getId()].getMarque()) { - possible = True ; - listLabel[n.getId()].update(x,x.getCost()); + possible = true ; + listLabel[n.getId()].update(a, listLabel[x.getId()].getCost() + dataInput.getCost(a)); if ((!n.equals(dest)) && (listLabel[n.getId()].getCost()) < 43){ tas.insert(listLabel[n.getId()]) ; diff --git a/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Marathon.class b/be-graphes-algos/target/classes/org/insa/graphs/algorithm/shortestpath/Marathon.class index 494128fc6dd97002630472884613c1b4ffa6b52e..d377ba03455e6a9f1d750f9dc71910d3ae843d20 100644 GIT binary patch literal 5390 zcmcIod301)9scfQl9xoQdg)(8w!jd)#kwDr2T3==!$&kss@a9c` zYNb`{R<$k_OROF|QQ}&m*a;B3Xj`#ZwTjxh)w=I(UHPL&<9FYiVI~ z?{EKp%gg!yo_z$sI{Zt4OTcHCJ-$#Rs`+|MZJ;;m)51N58M1o&ebHXSwDhPopjo}X zR?XzYh$wIiteqxNM}k8;N$Zn*1@hL0A|Y!%`Bb%B0jDO-((0-^1>B8BQ1>7Q1uAlp zCorQW6w%va{oT5`L+cLf0;MfRKnr(jW=Os#Hr-ZlC@Qdgy26vT*HL7U!Ufh$mo(i2 zw%!6I5&b}m)~$z=Yz0~}{m@U-!oD{CuB)D|Fq>nW*&lM7qa1jBre9Sm%Mjd==%W5Kwz` zt2r_dv!p)->aL8n9SjdDag~CF0;{hOhbpedB7uDBv_vEpB}IX`bL3ylWk2U zkp~Ufq++vlYOVxOP{w|%ie}s>P{5sSW~e7bs8(c+pPh`7QHzRJw6Tuq`(s*|E|~!T zghti7JZQ&u1+N#FnM#fZ!wBnIL`4U72q=SEIHqsgEB&%7;a1zM#5JO&7M(ICHw&~) zStZgEFiG5$Q8*lj)SCfjrwn(Oie1=EOV|N)lg{;~Cvqce1j{~agMD4#4JzJWv@!~&A3 zVMZmkdR2t5kErB{^mcQ)t1clRO!Y6102=H;ALw;MhP#+-n%LNgd|6$jBlfE>!AL55 zLy=&s#KGJNFiUfV3`tDIpyX5{RWh3cS+L()qnj+dnEEcJbQuz-|r zR`C|xPLKC%=KdISd)8$F=OH!^tGEMq5}ToDeK>3!kp8X6=3hIabfUo9Rg_?+)bTDA z@5H+ta8tf5tZaf&Nt{TazDLD-Wmwd12cVr2n3B!=RJs8q zMkX9m45I1NTe>xN=eq*QvSJ8)S;Ywn?zs-Q)6!_Wt_6Dapn?Yp>QoW0H%;x3>=GWF z#4-tnhg8Hd>L99JH;IPwtTk7{K@y%(aaNYx94*Mo-G{9nJd8&bJi>C2lGSL0!|Vpk zY5Myye2p?peNZ=}GS3o~E!DNEJ7qv0SMh|5jIynLM{{d^i-K=t?Id!J_25Z-QwHEE zfn}KiNbBKsliQ^9;4r==iJum@JCpeT7`=>uJBmt+>`ASFd8yfBm28mCC{vz=$Qfkl zvPgGgCJ@c6GhqhV9z6I}u{(n_i*3%#%D`G0%kSbT$R>{~a<1So%WZ?@dfgP1SyLgI zqhys6F<4;dXK+c45WM8(0K@|5I>=VDG~?>4SeQRxM57@VBmuFDyx3_%Tpr|qjl*CD zyHu~{4O-~d%z&IV(ol6Nx1=v3i5A3JV&X>+hxNpV&z=k+DV-;~ckL8+CpgrJ;CiaC z;&Q5G@<|yciHcYs1AVR9fUTo~3v}&e%0Wue$(51yLEuFdUd&^C?O-1c=$k{*%|*#C ztfjI3FgjHZP}=V1WDx?Lups(>`}~lly43{ zDG!)!^HS}#C&7yY5au}?+|QwaT;VFKi4$D4aV%(E9LF{5%O6Iq-#vyUU8C^%bGf(T z3|0yF^GDF;%|C;+f~B*;uXx>FC5|T1;Z;bzC61epVo73i47FWeCFeA@6^l{q?C|C$ z4pzi*OO2%4BU!ykU}*dShdP*Z20bpa?u(RdKMu=Z zSmP~>MXM{!s_`~AgKsF>=nIER^u zWsTf;TSxLBj(5cI?jf{Mf#jZ7<%%+zXvf_)$9n>CeArtoO}c3aS0yj(8p>{KI& z8tiBDKEVAu;lmLu$1&0lVX|E9iFRAmA$EvlP0W5OMxhf}l?%M6Rm@-?o#><0`~=@Li_R3|AhW!S|S8 zWz4Ye;{rWVAui$v_#tvBHwQn$v&bXI#EMpJz;pO9ll+J{jGx%6Vjyk!4=8GqwbHjLx=JN~)R`#-;H<*NVy delta 275 zcmeCvTFAw9>ff$?3=9mm3`!fhRx`12Fvu`6e4YGe_3Kt zW@1uKDi^0)VootmF+PMkm{vO^p^Q|8+|-hc{1k=s)Dq|X;t~x_h0J1w(!7+^w9LHJ z6os_>B83v5s*=irR0Y5MlvJ+C3;9eL