From 0cca57b1fce5f1231ed4f7ab76e5531d82da9155 Mon Sep 17 00:00:00 2001
From: jerem <114385056+Jerem-EstIcI@users.noreply.github.com>
Date: Tue, 21 May 2024 09:42:20 +0200
Subject: [PATCH] quelques changements

---
 __pycache__/gen_lab.cpython-310.pyc | Bin 3692 -> 3045 bytes
 __pycache__/res_lab.cpython-310.pyc | Bin 0 -> 1660 bytes
 main.py                             |  11 +++++++----
 res_lab.py                          |   8 +++++---
 4 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 __pycache__/res_lab.cpython-310.pyc

diff --git a/__pycache__/gen_lab.cpython-310.pyc b/__pycache__/gen_lab.cpython-310.pyc
index d84fc591fe29dba5cc625f737e00aeb56973e1d4..1198905a08440c853d61b37726d42a42cc2bed79 100644
GIT binary patch
literal 3045
zcmb_e&2QX96rUM;cb&~94Iv`i@@4T=7TVCJARt6lrB-SYRWB7BRw>52GfACz?PP36
zYP2gM5($ocTsgEtAabraa?1aJgoU`kB?tZi4v62gcO7q9q)OB)zkM_B&3kX&d-L;z
zQ&V+@=g(``SAUvg><=209|MC+c%xT9B$M1{J>KS=c;Sn-xXPp<%{?Z~UC}nAxXD_T
zL+G*=Pixu@q!+|Dx-?OK1O}JzMz4Y>*5;D6h2&&F8hfm5N>f(wUy)T=!+%v;Fg%e~
zud3j>+esF&tZw7EdaxfH>}xmn!oZfNlfd@f&K(V>x0S6A_M_0>c00bxl)L11^bk+)
zWxSCM(&v5Vus&PIE}QswFup795tr}FNPd7?W{F&Hy4vj>{1|JsRLq^VrPs5Uh^ipU
zVoFL86?$3)+o3nMa3>6uR8fT0#M;DrK@mH7JZr~p2l6%T`M$Ed*q@>>z$v92?7VPr
z$Pwy|mYEs|CACJz(}_YgHDIhIQZrKis;)qNpJ{4_zu&vOwDMu3bhHv`=`EgLJb&Sx
zH&?EN-2|J8qm`>(d@bp$pbo=CudJznyf19tNiE0m0xxzP3#OtfNY!faX})tJFWtgO
z-lYgfj|qlCpmvM4K|W`zTyiP)teAbl*7+{K!gl$9$7nYiOQXql#T9nz`GI&~Zf;=o
zg*2aHva(_5#XcHz#LEiGEKah%vCOuf+nS4otoHe?;3z*jtd{%==S3DDbBU3nQuV^#
zW~gH~h;7soqEXid=wz)%jcXUdxZA3W<>#Ot+1=Z!=LOLj`+PR+B^vyq?Vm=4s4dRe
z7huzl;K9qApBiW^=hXa^^C$6U2Vf1YeycISS(JQ_mGl0U*rJ0i9#~KHx=HJ2K(h5F
ztsm-hO?AzhYG0&c;atj{Y?PBp2-Etq??rJJ$+$=m6H!z%Z0C((w-oKVu<VCj*N-lO
z87(NWXygjeW=&<CtfydQpX&+y9r@A}WZ}eSJ1;$olWY%%6qcrrO<n{kRVzP)ksCw>
z+z=KmwG90Pt)UF3l}$pVmYD_AHn6-s;d^U=qO;PT?1p|A<byogSz1Zy(KV1J-iW4}
z({sigZ}J8gpNfC#rpb3^j&EVCM6`c8f*Hnju!or4W%n3L#0LULL~Jnqa}1nY7j(dG
zeZL|G#=yjknT@~2xH72524VcJ7}WYz$v1?)->>0las57ymN8G5X~NRGI7+aT&*6ww
zaKz?m)I>vVnEKk0yvYiAP1ay3=vPXXJ|1b37R_gtzzr?+#^udiUXvCqeN*!I*+`F8
z79Ptne|@Aef248b>AR6Uk7Ven9P9mYjXc(^6UeUdHXCI*s!Kt+k;X{?*fNt7S*DP;
zVPr#YnU$*1JXVbpc{NajDr)eT%<9&M#VpgmZ~ao(6xnVI>r}HZxqhaQ=h+~6ra6*J
z<KY^Jsv_$oBcL4ikcGL)zSYOKQZ{xC04U@DiK*lxoRb2z{ttv6|K2?sViv9+17JSn
zJ3amh{;!aZ0Q|9rLkOe^uya(B;0{j`A(%N_B=P|f!sX;OkOz>ebSJWdQ1@J4(O2DG
zO6JGa*Ycay!M?46wiT&v7~o3Ms-|X)%S}3=0$c}h@lu+;^g07b!WxZhB(7>X)HS5)
zB(c-It-~N}n{k-vlzV9<1HY87r)JlUR4Rf_yT0lLL&f9Yh{^mer09<E7OY2~fLK$e
zu=p&W;dNo*H!bFPL(Bpi$N2{4r?dHnIpV}`*2~tf)32Wrv&Ia!a6KVFwJSD11sfJ@
zR{75C5L!#lZ?tN3!3o@+a-6j8IK5CNKJg95*-Bi0D5*J)47-k_8wfPRaQy;tbiFE(
z4B@F%^qGuEXfcyphBec8R?|H0Z&kWOhrK+%Ph&0<l#FCHvrnnDoQHFfx+J@LH5f7^
F{sj<i*Ixht

literal 3692
zcmc&%L2ukd6rLG-z0NjCLnuvJpjfB^t(2y1TG6TvRYfbpp~|H~LQATZv*V^tymm77
z1~u|ZNT~#;sz@9-wuegO&JREeKcGkCE2kWhxWK938?Sf0*&He;;MKgHdGp?z=b8Dw
z8AlTnHHPP_>bv)^PBZo!HOh~H#!Zy?0|?0^4_KQwIH$S@L_;hwX-M-Cljg2y7*gD2
z^~wQkS)FH9<%ZG^ljRmE%8x+fCQ3X9;jspntRW<q;t@j-9k5}_inP$K$f~sQZ^<zP
zuVvPf7v6DKTNI;ss7~b;N_+w$<tb~jls)CoAe%xm`10ktkr~o&XJakpd8!$>tC^9w
zt96l?u@~G|CS3QJvhnxV^;_3gK94;WuS81v3l|qIUb=dD<#yESw7oEiSC;(bv(D-Y
zQhBKGk`KI<H7}%)^P3MdyV>+ZKWR2Alo5rs_$1#sp65Pa^tL#9il>SSnbVxdzd(G$
z?sGjUcEY}8>wK5rX1l!0rO_2AM#2)2LQDF4SGwj<d%jyqO=)b1_@lH^{8JQZ&N8hv
z2QBrnG%;o7DVA0i+18na7NN2$x>jmQYr|A`q*3nQIw`9u@;HUnUu4owc@gWB&XmSj
z#3EqQ$2u?YDmAC~Y`V&A@Bf%6?^<7X&cT{E*GPI{>_?#^I}RqYH?Ms=<%QdkKja82
zIIbx_2t211wKpS`xMAX;H3;B@2&ud{3bx%<^tjtz3tkss6+5j5UfU1jIp?BowmS;-
z1t<6ri>&tdygBC*LOC%4`(8hlp@pNJM+^5RO6)+aVb9$g$3g)xk63x}z7tyn5i#OV
zi+-2<rwV_Q{CoENfHsQWm)NUf{z6s>{I$^2np}**Age6~ew@%e+@LryWj4ij&iA%m
zf7j1122slm;v1+G4y7u_r~tcbo(4o+sBsEjZAC#8hTa}mv{eVgs!2UeZ#;+XoPCw?
zlzydSa6OPDE|Z{y4`?pxraF#4oj_&;UZ|+6Ue!Z43@omqH&hc48TT{3p7D)5r8h`V
z)1hcls1l!nn5~-J<Wu;~0g5%l=Hpy^E&d$0XQAJjI-K*+64472iZ#J}kIYlHj>X0P
zN9lrW)=2{bn`OXIzXqK0u7P4E;;DGXfJvT;4MY8uf-7gV<pxt%w7=HC8z_`~LqH47
z71lLE1tbrwmvd{fByG=nnOd+m!!L)d!x3wN*rCjG27+^IptbP7K9t+zk=)4tap9k5
zkecu>vVD8V|M`eNI7vP4TbsqWgFN+&>UoNt-n?0fk@u(OuE81j$xN-ZGRweHXj30x
zWpzHq()2<4Pq^lsgLC13p_U_9?$uIxy$m;ir+Nz;zcT|-qSUqhy>NdI1nGET!;ZaH
z6iP1!YAx91s5KMtc~;q^)3E@qmD6p*a+UJ8Jw;K~EJRj`6IUgf;f3-rs~tn+*bhBA
zTpifP3lNj`X~5RxHhyP$tyiXXEtfTJi%D+(Zcj}D^cLTl?m@g1ZV2SWJ46{8<UfFK
z09+ivU4es@;3D#)_6fhY*yV*T1p)N+=eszNi39-P$`h`ZsHI^JaNyWwS|^4q&>FG8
zSh*+QDFASS+$Lp^M<3Oarbh-P+gwYOlt<8@MGVs8n4c*k5{c+>h<1K0w3^Cj^pdtT
z&WKizQ_}XRp~!2fCy(9B_{g5oXob(9=T+WE&-me)!-xa@@H-vW7o!dIqwiJjE3zzz
z`KZ35VitboJ}L6GDAsH17_~ukMu*_}pAub(U80V@QN4z1)Zga1*bU?I_091Thpujp
zA9fO-?sfl8zWqB(aX&c;z8G*`-N>&-eOfzAWfN}O3;amsA0MB<IerJiv`v13&+^;i
z3o*riMtNaO((U9AYjWpAkG6(fm+Mvf$OxfqHnUo@*^Xo<p!#^Txz%xlyhqXJoxTSt
zx&x{ANYLj^N$9H*aUWf9Vsfw<Sk<&=#@|<@ubY`gpK?)KU&7RB=yXRZh>of6p!Q;(
Q$_<*Un2v*Sgqs#G0d=rT_y7O^

diff --git a/__pycache__/res_lab.cpython-310.pyc b/__pycache__/res_lab.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..e86912ed3a96d313c2547aaa899b967050a49025
GIT binary patch
literal 1660
zcmZWp&2JM&6rZoP7uN<C@fDQ9iVHG_s(cA#qN)O<azH5(aIqXkiDv_@?cHQ%7m;W!
zA*Fvn)k9VF$c+o<-uqwdwI|=Is=f4p_`UINVsCb}Z)V=k@4a~+zlmF|2E+6B4^MaU
zI%9v)V(}4Je234jLTIM>PprqZ&=MopN_!ZEu03a+`hfP9kB13;kMP-FIk0>xGNHwY
zn?Dk!WyZC<#16${w()){E1KV?Dr1>kVVPQCT8)Icu0^R?V|y3MIsWpIu=f_$9(I4s
zB=pL>AU*jhEQyhKLMJb>674J(CmS(i=je-z=&G)YR?hFwrNy~#MD3ZX?gVn45%~Rh
zj3(a>UDZ|4doAQv-eYBsZ7t!t20N&ci@q4OxWsflV~2_(YE;c%pHazX)CDt?iOr~r
zGYN5Ucf7T|Z-!CwIt;engo7ZB!eAUnuhK9zflh<nacYA>oSGyUybdSBD9~Z|z@xq0
zj>tW;6}<{`Z<lOzyj;RwF7<HIt3}&8@zCacnDZY$Fw=y){~tW+_Fvl2*nVvE@Yc;+
zH*ep+(|;Tf(n%O4w*UPwd6I7TpB^2mZ$i5Xn_utl=gsn5q@XzL4G6`3eim<=pXLEy
z<yRoD6yquv@5Fz8)Boq%8O6<MY+veN1;tSZKfwY$%8^fAbnWG-sA$?#iHr;M8afwM
zQ%KU02EEnZL*|ilwQeZCGqP^ztQ~G@G$`Yf>J$koi1~s9C1);LnB}Js;O0(jCgFK3
zEuDKFVv_>;q@-y>wG;{&Cy$Pdl%0fHo*xRdiwg(`pN}dNN3;_l)>jK_31VH%#B-vQ
zqhzLNw7=7yqRl|p1q50Tn1@J0VRg-6@3X0lo|U=+dF*$N+E_xt6HqF;JNH#mva~^$
zg!A=w358RE5;D46?$gR4tG<3&LcteMYB@?=K!`%S>u8OETwW#)1!oB^HJ3@x5zZrB
z=FxSyZm5HdEAkndQ3cX-5GY_tEA!_E8;{eVd$6*goeYy8i~?8WpxcqIISsC7=4#ui
z9rsDE1`+_;Q@gQ!>*Ri~eQawJzd_JS57i6i(4}s_foOmzKFFbD8?wn8C#28Y|2A6<
p{AqB|<x7Cp%ac*VIn9C}=g~E+zcz_=Iu5^ew4`42nSZWX{|r(FNPz$V

literal 0
HcmV?d00001

diff --git a/main.py b/main.py
index 1ed9af9..27797cc 100644
--- a/main.py
+++ b/main.py
@@ -13,7 +13,7 @@
 button_frame.pack(side=tk.TOP)
 
 # Création du canevas
-canvas = tk.Canvas(app, width=0, height=0)  # Initialiser le canevas avec une taille arbitraire
+canvas = tk.Canvas(app, width=0, height=0)  # initialiser le canevas avec une taille arbitraire
 canvas.pack()
 
 labyrinthe_global = None
@@ -31,9 +31,9 @@ def affiche_lab():
 
 
     canvas.config(width=len(labyrinthe_global[0]) * dimcanva, height=len(labyrinthe_global) * dimcanva)
-    canvas.delete("all")  # Effacer tout ce qui est dessiné précédemment sur le canvas
+    canvas.delete("all")  # effacer tout ce qui est dessiné précédemment sur le canvas
 
-    # Parcours du labyrinthe pour dessiner les murs et les espaces
+    # parcours du labyrinthe pour dessiner les murs et les espaces
     for i, ligne in enumerate(labyrinthe_global):
         for j, case in enumerate(ligne):
             if case == 1:
@@ -55,6 +55,9 @@ def resoudre_lab():
     canvas.delete("all")  # Effacer tout ce qui est dessiné précédemment sur le canvas
 
     # Parcours du labyrinthe pour dessiner les murs et les espaces
+    labyrinthe_global[1][1]=2
+    labyrinthe_global[dim_global-2][dim_global-2]=3
+
     for i, ligne in enumerate(lab_resolu):
         for j, case in enumerate(ligne):
             if case == 1:
@@ -64,7 +67,7 @@ def resoudre_lab():
             elif case==3:
                 canvas.create_rectangle(j * dimcanva, i * dimcanva, (j + 1) * dimcanva, (i + 1) * dimcanva, fill="red")
             elif case==5:
-                canvas.create_rectangle(j * dimcanva, i * dimcanva, (j + 1) * dimcanva, (i + 1) * dimcanva, fill="purple")
+                canvas.create_rectangle(j * dimcanva, i * dimcanva, (j + 1) * dimcanva, (i + 1) * dimcanva, fill="lime")
             else:
                 canvas.create_rectangle(j * dimcanva, i * dimcanva, (j + 1) * dimcanva, (i + 1) * dimcanva, fill="white")
 
diff --git a/res_lab.py b/res_lab.py
index fadff45..17f3266 100644
--- a/res_lab.py
+++ b/res_lab.py
@@ -15,7 +15,7 @@ def longueur_lab(lab, dim):
                     elif j < dim - 1 and lab[i][j+1] >= 10:
                         lab[i][j] = lab[i][j+1] + 1
         nbfois+=1
-    print("labyrinthe avec longueur :",lab)
+    print("labyrinthe avec une longueur du plus court chemin de:",lab[dim-2][dim-2]-10,"avec:",lab)
     return lab
 
 def lab_forme(lab,dim):
@@ -29,8 +29,10 @@ def res_lab(lab, dim):
     reslab = longueur_lab(lab, dim)
     posx = dim - 2
     posy = dim - 2
-    if reslab[posx][posy]==3 or reslab[posx][posy]==5:
-        return 
+    if reslab[posx][posy]==3 or reslab[posx][posy]==5: #erreur dans la création du labyrinthe 
+                                                       #ou dans la création de la longueur des pts
+
+        return reslab
     while not (posx == 1 and posy == 1):
         if reslab[posx-1][posy] == reslab[posx][posy] - 1:
             reslab[posx][posy] = 5