From 0026f5bbf69d621585d285b08894ab7ea4857cbb Mon Sep 17 00:00:00 2001 From: Antonio MATTAR <antonio.mattar@etu.univ-amu.fr> Date: Thu, 30 Jun 2022 14:23:34 +0200 Subject: [PATCH] -Added the stars to the reductors // -Added the comptability of the clear cmd for Windows/Mac/Linux // -Fixed the quality of the images generated --- __pycache__/app_functions.cpython-39.pyc | Bin 2796 -> 0 bytes __pycache__/image_maker.cpython-39.pyc | Bin 6665 -> 0 bytes __pycache__/logic.cpython-39.pyc | Bin 12914 -> 0 bytes __pycache__/parsing.cpython-39.pyc | Bin 5320 -> 0 bytes image_maker.py | 18 +++++++++--------- logic.py | 10 ++++++++-- main.py | 7 ++++++- 7 files changed, 23 insertions(+), 12 deletions(-) delete mode 100644 __pycache__/app_functions.cpython-39.pyc delete mode 100644 __pycache__/image_maker.cpython-39.pyc delete mode 100644 __pycache__/logic.cpython-39.pyc delete mode 100644 __pycache__/parsing.cpython-39.pyc diff --git a/__pycache__/app_functions.cpython-39.pyc b/__pycache__/app_functions.cpython-39.pyc deleted file mode 100644 index 45b7d5b6b5a4d6b986b61f6b283ec4b4274fa578..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2796 zcmYe~<>g{vU|^^e-;?y3n}Ojmh=YuU85kHG7#J9eH!(3Vq%fo~<}idnXhtZ_6vB|o zoXXP7(99Uc3TLswS?q8Y2b{$TXK}$<+^IaNY^gk{?5XU{OwCMDyl_4nn9rBWlgg3G zlgbJf=TGHN<w#|1W=iExWlaUE0I6zbiV^^ufv%PvroNd8MYSN<G?1+z6WLP*5b{w% zU>iZ=AbZ(Tc|kU$@`1=GVXz#sYe4SdN##uCN##!E2V+i<`#`EeIF%=r3t}^v#RU?B z;3yF!H?Tw0G&4ns!bL&0fLsCgCnR)0I-|tED)>{`pl%X}^T95Sk^u7&eiK3Rn<R=H z8^~0M|C*Viq|oH}nwdcIU^}JZa-a|fxr!~710mnc6eR;!0g(lf>>#rtu7sN;o5GaB z+`<qgm%@_5+QJYepTd^H-og;2kiwC|*}@Q|n8KC9-NF#1l){t3+rki~oWhsF-@*{3 zk|K~I*uoH{nj(}U+`<s0mLifO+QJZ}o+6ea-og;2ks^^I*}@Q|nIaX;peg+ll$tde zZ!u~mGlG~<%*4RJz{<eD;0#LJK@1EGH4G_?*-S+eB@88uB@87@B}^dy1~Zf}moS3Z zwTv|kDNNZcMRp*O8pdWOh=>J4EkmIaOczMJnJJhdg&~+hli9BbWaUc`p~-TKJukI9 zJ~65I7Gv5i#tJC6pg@x;iY+y-Br~-rilrpAD0d}85eEYU!!Pq>tC-N@)S}`TUnkEP zm(=3ylKg_0#GIVW^u&_<qGH{G%94!yyqLs-g7~!3yyTM1{Jdhlg34RGDXGcvCHe8m z8Kp(Z844f|@_~HK$iXPU#Kp+L$i>LTSOm)U$)HdGNr5nk4G$3s1_lPOpBPJ+Y8aZC zK>h;d{$}Q2hLucyZko)uM3YiW661?fQ%b>B$Cu=nB<7?Ru`@6*++qoE^bFEuy2a>t zi_r<}9SFe*mMlojEYbow3uGk&W03#@0|QFrfC7vK7CAyNr+^&-b3_q00|SF5a}f^% z0|UfPRyWU};E<J!w-^f`mVrXC2yCN3dTNPVW>Im8TTy;)Kw@T*E|TpcRI!~c*wxwJ z&!q_DT6F6L(^E@=Q<L-aQegHQAlWa5&3<@9Xuy&tYmpc@LO`Lw2ufllprpxE!cxP~ z%-9ST(PV-oI89b?kltbm2?})uNAxXLH%Fgf*IUeqNyVCsx7hMZbCXhw(A_ByO*lD; zxk)LYsLe?%$t+8a&&(@HO;0T<HU_zx4U|?GIT-mEi=?r+99O(CrZ9mM53^sDSYlCT zNk(pJNoKM_YDGa&YH=|r?S`O6XK<*qb1*16^U&SNQe2vxYyol%Gy#FqIEiT)>YO4O z^kl^B=;E@HsYo7_QW<m6t!7S4NwG$<Sp^gXU{`>Gg@J(q#D+&6)?9?!<^ccjA|+6I z2B%yw0ZzWG1^MNvMRrKms!`Kg-%uZ{*7D_+=9FX><YXo%g31<0B>O?BlIR?Z)5GkZ z!SPY9LH<Q@SUk<1SsY)LT9ogCWG$%Bpxj!PfFM^Ftah>$6s4x5Cc7h9sYA_>4i0s~ z8q&<grAb~$mg+GuF!*U|-D1tjPtQ!g#a@tDRGgWYev3OZH!(dmJ~uHtwFpvwlqDA3 z;z%n>EzSr_EGhyeydqEry~S90i?Qk!WBDz{(p!ufMW9Ss1WJuX;-H`gmC;4AAeK6a zPy`X0AVM2NsDcPy5FrR6L_q|oz`Vum=;v~a$v@~8v!8#+E#?USAaLOVE^LZG#b^<z zECUw{MW8HM1j-#nptM>9N-*FuzX%kdMIa9%Wi3Qf=dj7mPbtkwwF6ZF#h@_ZVB}!r xU;<THaLgpYD8Q(}sK+S7D8uN(D8{J72oeGDWEhngHCQ;fIGDkZ6-+|d%m69m6N>-< diff --git a/__pycache__/image_maker.cpython-39.pyc b/__pycache__/image_maker.cpython-39.pyc deleted file mode 100644 index f628d10a2a3276b44b45ea3fa6899ceac7f8f375..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6665 zcmYe~<>g{vU|^^e-;*>;nt|alh=Yuo85kHG7#J9ezcDZ{q%fo~<}l<kMlmvi*i1Q0 zxy(__U^a6OOD<~^E11oa!;;Gu#Rg`x=CI_lN3nz1Y&jfJ94QPbY&o1!oM4(OiVIA0 zM{%dHr*O0|MDe6>rf{_|MDeC@r|`5eMDb-ZMDeHartq~eL<zVvr0}N*v@oOyG&4mB zrU<48wJ<~pr3j~pv@k>or--JAwJ=19q%b6kriiCVv@k@8rLty;r!l5Trbx9gMoFYd zr^vK0L`kN|rpUE0L`kK{rzo^AL`kP8rYN;AM9HKmr>L|rM9HRTq^PB+w=hP@rLYAv zXllL$g@`8OE!LpK%;Ho{##@}J70IauC7JnoAW_fU#B{JInBh{CSPoJG=D6kOmG~ty zf%HQ$I|Bm)Cj$e6Gbm7d7#J987_t~r7$q5MnZPV2NrqbH62=t98m49@7lzo3S{5*m z8O)2QWvyXYz*NIh!<xplkg=Anh7F`Qg*lt4NT-G^g-MbD&SrtL85S@@bks0{RM#+q z)YUMiut+kbF)w6dWGK`rl&fI~X3%8yD`I3|V0Z~8oIos)+cjBku@q-krQTvKO3X`7 zjp9g8Eh)&XNX?1jC@6)nG})t=Gjr2#u_ou|<QLsyEze9T$+*Rqk(!yFQF4nh^A=;) zEtZtTlEjq^MM4Y=48Kg1tztrpQ;UjYe4RXFTvCg(OY#e15_57g(-TYbi;8s%DoZl* z^I|eVfg7Kjn4MarS5SG28*F|&Sd<$SgaV*&W#nSyV&nrsCKX0C#v&0028Lvi1Prq< zFfg#fLfwXefuV#Ug|V5@g&|g>mZ5}k0aFT73iCpyT1F%`6B3)bkfVmNhN*@*jX9V> zlf~~PC|^K=>OTVmgC=tk$T7FriW2iu@^houL3Czbi6%=CKLZ29Eyki-jOn)+lfYhw z5W*mF&b-v}c(9MeKz;#dMMfSl<YO$72KfRM{>Z)n`2?JHBEY_=0jC{Eyh<=MGuASd zFw`(W<CjU20W8K07GsuVs9{WDhKhlF!z98`!(78G!XVC2!&t)zqElG184>BA2$Wij zK*=>zMVNs>lkpaFVp6dt%Pq#lA}Iz2h9U_NAqgTtk&5Iqp5&bT;#7#=ie*8b;{f@B zQ3MQ&<Un2nB{Gm82!p%@!eFnJfW5YWv4&wGV=<o>Lla{OQ!_&?V+nH!%L3MgU~krd zGKW+xa|v4wV-0gNQ;|vudksS~BO?PNL!m>VN)3|gGKQiEm~06LNL2|-8DmjF4Pyxl zgm1%;!Vt``lF?6-^A>APetKr|Ew0Ssu*9Ow#H5^5a7^4{$;m7(xg}l(6)c8&E<QQG zv>+$-7F$_jPHAc}*lV|>5{rxTlQR=bQekF<XO?6*gYyP+aY>OT%PkI=LAMx_qu9WS zpty(!GboEx85kJUKp_Z9BMgjujBJcNj2w(yj2w(?i~@`tj695BH7E%l6sDl011`H| z7#J8*8KM|d7^0X`7*m*97^0X{m{V9<7@}BGSc4ff*=}+8RzfmWGALz(bb~O64Kf8B zE1;ZK!&t)*&rriu!w}C13b7)2Q0iy8#R|@lx7ad^<5SbqHJNX*6sP8-6={LI15PMt z$%7+4J~J<~BtG5*<S|ghGcd9-Rtdsfp$C)4a1I-CE(VpD#bPxKS&R#qK=~6?mgOly z_$ACBI*X--v6%_VW(Ae0AT<c5vlVHB+z4{$Ew-Xma4E-}o0(U{3lio7`Hs0r2gHU8 zKvFr_L!eAtq{qO(U;*+5$Y~&N2ryOg!#x5q(@&H27Ds%1USe))eEco0`1suXl+qj! zn<qZLurx6TB2%ObvI%4$k|hY6G#MBej6pVm0*r%^gQW;0l8l^>Krsd{=)ADxBT(vR zWGG=?z>>nakg=ArhH(LF3aBb!1m&a>c1V7ZWM~EzhMb@RqnW9esRmRiu=rJpre&s= z7Nr*Jr>3XJC*>q2XX_Q@rQc!>a(4<@$yKBPa=s#nPz4bnXWnATFG$UcVo%P`D@!dZ z0T<0h${<-#ng)A7letKpfq@~49b{-`ZaO5{fV~YSK%sn#FS#fclAXX6s~sp9K+yxr z5TMM!#VEwc#aLv9Ua-(OK%`*-0<XCc!BPZ@E4Lz064zwD#afbDl$#pGi%^KmtNakJ zI>PEgcN~5NB|4PI2PHsIi4D%K7ce6q)N)_|MS2OSMF3(km4NaGV=Z$DC~q*<veYmy zU@Kv-Vaeji;;doL;%sIrVK3pTVb0=)h=FR1EKX^LW=4=$8dEbPxE;b=!n1%kg|UPk zqz9t1nF*u<%;pwnNMlN2TF6|>TEn`4uZ9^z9j63C3bPbL3QHOjD1U-gv1D<iuz<{f zi3KyPWc33F>PqG!P+^EfaDq}4C?ja{gHz!x-ppdhq~emI#AHx2?G}G}YKdoFL1~Fw zQGTvtQt>T;^wbjn(h`J75hyrsaYMo$oW{U8`xbL<Vg)2cf=Yl}%$a#5MWBRN1Ww(| zd8y^MSPK%1OHwu2ip&`p7;dp<g6z4)mJc@l7IS8<A&4-##hr+75K{g|PTr15#bB!g zKv52A#ekAGsBy!=$iZmAsKKblD8g9e0ZQbc@);R}JP(d|kh@A4f*BxXGvh7p;)2BF z)Oc`<49QwV)&hl1JXBFiW=TdI$Z}Az&%js&Dnd}&ub_4gD4l`wRWTnUq$LHaQfe4n z7@8TuEfB^OW@M30h7zU}7Gx1{3zro|gr$Tzg)N(@D6WL1h9!kvgrS)+kvUJKgt3IR znE@fz%#_Gn!j!^+tQV|;4OFnDa7r+MS~0b(?F{XVX-p|xDcmg_5SP`ml`y67fc3FK zTw20b!`93Q(o+I%1J$yZurJ_9;jLk<VM=34;akXD%aOuX%L&pSt5nNX!?A#~hO34% zg$<e_IcvDGxJsDC8O#}KISZfFa0D}G^82A=Nl-9?a4{%MK@nQR5X%E9b+Z`4KrIy} zcvZBL5uB`6GTma*Gq}Z+nTr%x;3UFnlb)KFT2WAB2de2mgW|qQCq1<!J~=-xIk6-@ zBR;n@rzA5TQsd~^<m4wO<`moMA+&*#2uK?UgB%6IgdJAo4a!?SAOf6bzy!!eMgHJE zAp=7ZD7ljFZBV`{!exFc$X*J}FA4-1fXnnWkR-@-a9cjz7z{4klj#@yc4fou0+rDi zR)8`UC{&9<)qgre4MVINB%PEn)-Yx<bufr9)G%f-gNoh`hBT%Q#uSELrio02EWr$# zjGBzMIEqq>6LSl4QZ-q?1y>QM>4#{>fCG3XQxsQjW?np`TUHbVauGZ_Z*kdxTDZyi zxdnDPpyUcFNZ1&e{#WS|lgi+FF?>d3GQ%5Dc_62PBMMZh7FmHBX52;gAW?l#q03xc znp@-v;)1;mDz<Jh=cML=OX(s<kOZhZ3l0xW?kM)m+<1_K!9ftkm77=r4U;HN5F1=p zMsb3I3c?g9$uCLFfwWm6B79I2pxG^o8=?Xt$(&ML62)4OUmRai<Oi}F9LT{S7AT5u zN#YF9L{Px1fHSBNBLs3V@-c}psxa~}GW};`QeqThWMSlB6krr!EDA@j2tYX;R5F7r z0#Geg!mxl5+|XkH_wSkfsw818mi(NQcz9z3)Qr<)f`pbSC~z601W^>kgIX(KZ-5D~ zH-sRSrGHKeysc6Waz7~HFo0TPpgt-}asbJIQa{*zYrriOaL0}jRC?Dk)i5pqwbhxj zSh84a7_(SGEq73}G>g3kEC$X3te`AV!<fYmZ+$S9a4g_VVJu+=>4B(hW&)`Iv)SRT z59S)?1zezxA(}c?wAKem6;l>V3Jb^#Xj#u3%ur+r3K;GpkgtkB4Nyov11CaI2Lhb9 zAlVKS^pL=WCp}FTaPuIF2NtZL5RKwWOU%v80rkDo(E~g!5u*x_zzlFVu>NXLu!AfG z^*@kW3Xz}$0?L1&6a~Vd2mqBd;0Q1RM*ygwodxOvFhP0+DNGBQYME=8vRG5Vz3XO1 zP%|urwU>nvl8D&+s>B_0a#D+2GK&jx5-a0_OH$&4()CJ8(q2vj1rgIrP!|MTq-rvQ zDFmU(c#9=1Kd(fSy$GZziUl-Y25Db`+!e)9QdF8+Qdy9Ci=`yBqNE7aOVDHiD~Mvt zE6q(xEsA1EDM~CaiUDOOaAE`#;1ns4n3CcLRuqyCZb-F&0tPblz{AADB*s_-YTclu zNszUmU;zio3V4vfhaT{^ni-lIQy8<EiULa5YM3D-FU_FfV@zR4VQK}9<}sGAf>Jkl zTrLZ$iUr)kVg}{T8m5JeMLi|#HB8NnwV>e$<}A({mUIx0HBX|11ywwY6CzUs>bA4` zy#zVDNE8$j(V)?~|NsC0*M#)Lz%Af{f}G6cL~sk3Cq1>qEwiY&BqX&c_ZDw@YDsWv za(-S4hzm*0VIX5b!BYfEHsHbq9PY4&ElW;nTFEWeBG8atkt;~C8>r~zPDI#(-e!UJ z+8hfCz_9@u?<@w5{UDmPJdAwM@h;GSh5!?&WGhMsC0kHg21>FZ3}VB}wGgB@Dv~Gx zl^EbyXl4p#C}CK@0va|dGALn!hC35foDD4QQNjcn3QB>9bEGggGd6(-Gc;NJLfooE zL-UGD3kvd!N>Wo4Kz%j^P-@iV1a~Wnz@1xAuN&OcEV2fL0;oA&1S+_}?!Lw8iWnRQ zXL+<h0SERxP`ZR<SkTBN6f=S4LXttT3i37xqa@E+paEm%qJ$ELEQSS)3mIxzYFHL9 zfeU!n8m1J6Y^EZc8ip+91uQkJDNLYYJ#mH<W^slT7ErgUa2iyODTP&>p@vnQ0aHz$ z8PuE_s9HvZ{yZtD7(_oKve}?^tR|aZm5^$ru4=BXYD#>(s)w$sudZrv6|=6cZWRlt ziiu(l@N@sgs1F(rNl7e8Ey>JHy~UiDUw(_DxTGiz#04k0D3;>HGEk2SRIc7)0gaB_ zVkt;0$p8-`rxt<QQc+xa`Q`D&B}JKe>1aWGixZ?Boa8_mx)@YIFfg)!hlx2DWtdc$ zI2c8kiV8r56=R5|{4M6h;*ugzIT^*Clb@arG7*&AqL>3beIVsHsIV#m#RWJW++r_C zEGh;m69=V$ED!-|-GfI8!9#$MF%IxB2qL+Fx|rbJ8>FcMYNbT6J9#>XI(a%n@*B8r z0cSsOMg(O9aGC(S70H(%9~FU%JPsSkSdtwmj}(Ij8z2M7AQIGT<Y44r;^5|B=U``H f;^5`u=HTSu<ltdp;$Y?z<6z<7<lx{C;@|=R@BwR7 diff --git a/__pycache__/logic.cpython-39.pyc b/__pycache__/logic.cpython-39.pyc deleted file mode 100644 index 5597bf98296c0f6d31ddd7f58fa37fb81ab36d39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12914 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 ZSU6ZXggDq)7&%xu{5ZroG&zJg*Z?SM^PvC$ diff --git a/__pycache__/parsing.cpython-39.pyc b/__pycache__/parsing.cpython-39.pyc deleted file mode 100644 index f89a1bf0ea84b3e6cfee52d2a2ddfe97922d679b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5320 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 diff --git a/image_maker.py b/image_maker.py index 783f458..c294f04 100644 --- a/image_maker.py +++ b/image_maker.py @@ -94,20 +94,20 @@ space_width = 0 def get_space_wdith(): return space_width -def get_concat_h_multi_resize(im_list, resample=Image.BICUBIC): +def get_concat_h_multi_resize(im_list, resample=Image.BILINEAR): global space_width max_height=max(im.height for im in im_list) min_height = min(im.height for im in im_list) - max_width = sum(im.width for im in im_list) + # max_width = sum(im.width for im in im_list) min_width=min(im.width for im in im_list) if space_width == 0: space_width=(int(min_width*0.3)) else: space_width=min(get_space_wdith(),int(min_width*0.3)) total_init_width = sum(im.width for im in im_list) + get_space_wdith() * (len(im_list) - 1) - im_list_resize = [im.resize((int(im.width * min_height / im.height), min_height), resample=resample) - for im in im_list] - total_width = sum(im.width for im in im_list_resize) + (len(im_list_resize) -1) * space_width + # im_list_resize = [im.resize((int(im.width * min_height / im.height), min_height), resample=resample) + # for im in im_list] + # total_width = sum(im.width for im in im_list_resize) + (len(im_list_resize) -1) * space_width dst = Image.new('RGB', (total_init_width, max_height),(255,255,255)) pos_x = 0 for im in im_list: @@ -170,11 +170,11 @@ def saveImage(image,name,path,date=True): now = datetime.datetime.now() now_string = now.strftime("%Y-%m-%d__%H-%M-%S") if path == None: - image.image.save(now_string+'---'+name+'.png', 'PNG') + image.image.save(now_string+'---'+name+'.jpeg', 'jpeg',optimize=True,quality=85) else: - image.image.save(path+'/'+now_string+'---'+name+'.png', 'PNG') + image.image.save(path+'/'+now_string+'---'+name+'.jpeg', 'jpeg',optimize=True,quality=85) else: if path == None: - image.image.save(name+'.png', 'PNG') + image.image.save(name+'.jpeg', 'jpeg',optimize=True,quality=85) else: - image.image.save(path+'/'+name+'.png', 'PNG') + image.image.save(path+'/'+name+'.jpeg', 'jpeg',optimize=True,quality=85) diff --git a/logic.py b/logic.py index 164e586..576ecdf 100644 --- a/logic.py +++ b/logic.py @@ -268,9 +268,15 @@ def beta_reduction_totale(terme, path, saveImages=True): return (terme) else: if path == None: - captureImage(terme, None) + if annotate_reductor(terme) != None: + captureImage(annotate_reductor(terme), None) + else: + captureImage(terme, None) else: - captureImage(terme,path) + if annotate_reductor(terme) != None: + captureImage(annotate_reductor(terme), path) + else: + captureImage(terme,path) if beta_reduction(terme) != None: return beta_reduction_totale(beta_reduction(terme), path) return (terme) diff --git a/main.py b/main.py index a717a71..24c0b1c 100644 --- a/main.py +++ b/main.py @@ -8,7 +8,12 @@ import time import pyfiglet import keyboard import shutil -clear = lambda: os.system('cls') +import platform + +if platform.system() == 'Windows': + clear = lambda: os.system('cls') +else: + clear = lambda: os.system('clear') welcome_banner = pyfiglet.figlet_format('LambdaCalculus Interpreter') good_bye_banner = pyfiglet.figlet_format('Goodbye!') -- GitLab