From e36cf4b81ef0896e61915f9ffe932dac602690cd Mon Sep 17 00:00:00 2001 From: urojony Date: Sat, 11 Apr 2020 09:23:21 +0200 Subject: [PATCH] python2 support fixes --- __pycache__/shiroindev.cpython-37.pyc | Bin 13483 -> 13464 bytes shiroindev.py | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/__pycache__/shiroindev.cpython-37.pyc b/__pycache__/shiroindev.cpython-37.pyc index 23cc25b94f49522c909f97c12ed59e26135b979d..e7b1ce74733bbcecfbacf15311ee1e6e9db3fdae 100644 GIT binary patch delta 2865 zcmbVNOKe+J8usz~5!;EA_?d_8#7(a4B(+mg)CnbN)6!PrRY-v=NN|0w)7#!_yXV?z zf`B608Ho)Lj*zBPjWn=BvzU=QELhD02_Ye|8VSt>2^Q?o48yRZLTLW~+|)@-HH-1$ zKga+1zwi97^WWdAzgB}MfyraYK=CPoMcdW2r)+>6(E9YC90Uxqgyayc5iP9u z%l-O*JfKJ9h(0I}>O=C7J}eLGQ8~J68 za`U=P9-*Uj3>2euoTgzNqZyiob(~JnNm$b~M-Rc8p;L4k)-0819@YsZStGPSi#Lfp zNoVLR=yG(99)|T0EzvTpQ}i^wk1l}4G<}F3rT4>5qG#wa`U}|Q>Ea3c0GJi%S$dp4 z2&y7oqRXI}QQVhjsh!$u4tj!~gp;{_niYBqG>57E37d3|e?(R~Vf)|hB+9>bE+kS= z1tWyDa65^U3=uE!lMrEXKJWT~^z(nZ;<+fCG9hBHGu?((X(?ONus56_Y-Ecvok-2XILaojZgV63fx9PXbW3@lW$ne#7^C@n@(h3x(jlWD3+g5Btk` z1nk}*yI8GVSA`i|Bp{f2%i6l*i;Ry4<00P61SSNOm=2?@@Aq+k%)H_s9EL+oGArX% zp509IfB8of7K5d+io9OEq*SlW@yWp2Oc3l%XN7GTqG;e!8fm&AG68X|HyhX3ef$pr zi5%ho2#oi&?3COfAni8@|1mIfz7Jsm6j*%IX|yjIP_8uoan#$o>7Yuzmp4>nm1;|E z)T@6c2>1x)H&W{MFFW z`w?KeSf#$9uu)Wxp}-vM`eG8R+E(ns5Bn4PL;SnYe~5>F9WIu{Yr*Q7t|n9KEwj&f z5(x1vLTZ?JQ4b*N60&+(nlJYsOZSv0ysp-p?N<42Mjz|k?w=rJfd6^m7)kRx14l@N z&qcChJ-Fa{t-8!nRMpT!=Xv+`%U!57--w%=Lwt`0r%a~h?)rK_nnK06#4(KHr`3LAk691DDm;rsaznAw@4^5d^7cz z7F@x!9JFM$ttpL-7?v~K8?E6QC^kpFe; zX{#mv2Pk|HRE~7cjh`nl?tYt&-D})s_{Zsvb==c9q5zWw9-bY1blaGhcQWeKK_`XL zp?yYTFbA2RpUkd8ciqYsqX!Y#%8gAW*7-c!Zx5mQ3+`uIjdZENJp6~rdE)0YxuqC> zo~#DHhP&rLNFiwOo4NBnUmDX7BS>L_b-MFi?z*GYz430ZEd$(iZC12)Z`niu5A%1V zTNZ71j9l0kl!ve8S0G8@LOf+Ul{zgkWZZkWf<@-bg&6;`kmNt*`-SyH&uCf$i?iY+ z#@{VOdQPkS!@@>Z_}=wG-Sa}~x4xd&AwO~GYo%E9VwNNyq~%s|Nqn*);5X2-H&F;5 z#a!`XBjMmZ+4-rMAW)e2?5HHZy3ce2>E3LH4m|zZ7GIm)9ue(&9<4=1-p1V=2+0Na zzn+W5dme=87A2{@#DCDa(^b(rEV^ z6k_(=#@#)pnCUmRbzNyOfd7%dS3XNh{QGj2kI!Ei_912sgy{mK=C-I2|K91`)UO)gu@F3k{A{1poj5 delta 2832 zcmbVOO>AS;7506$pZ|a2{Me4;BzEFtp6&4@&NMR&nIR16Fn|;^P&)L%#Paw&hc~=u zd+xI*6Ur!?p$j&Jxhz`L1+=@u0%Rez2qCKOU_&J&)Tbg?b%9t>q)JGYdhUI}6PuAL z)r)hk&OP6E&pG$p^ZXnAEj@BR5(&ESSO4cLJ1@N&Nt4%KUCtf+%mprR8?q`3?Nfc4 z{DvPqZxVubHK4oHAb3FrANU~vK?p$@A`pcb#9?eVqK0lxXrV3Fm9QGt!dg%ZZ@8{E zFLTy}5iz4`6nXdwF*SyI+=!cF>X?~O6Xv)&ZXQgi6Xv8kX-=tAW>QTaI;YeWOu*!A zmzsttNTQyG6r@pSU>Y*0XJ7`hsIxE&bEs!w9&)JXAP)4H0 zP=pfdMJ>}LP(Fa;w~1PS3YSd_H8tP;4Fs#EV^ibd;oQC^wRfI?2e%QcO z3C_Yf^eV%n@BnP0~vvS1pQ@DVZRd7G)QpjWML$c*n zh)s%pN%~A8N%pyCoy@SPH%ZcL$@^zA#=i2V3Q4>=Dntrbwrm;ou69$wwdFzKA{9dO zEGutIRA%plCfI>|Au|m6KDc4%R=3eMJLitGuVm$79)UE(#UcvZbFHnnXabjtn~rny z1UCn6)Tv&-YG{@dz>z3wdsOdM%j}YGcO%PjlEdUSwAN7$)z|772J(zDcm+d+edl`* zQ~#rXc49bYdJI{s>>vK8%7YC&q`-q);s+8Z&_PTBu*R+g_I?alb^siAx0C{K@=ma- zaE?Q6)k~YbmM*;T2!Y^rcbt(u$^Mf}vX|#Wj|mj9-B!;$8rVpp0{9bTup|^RKZn@y1MtuYX9;t`+rjo&y{i^pASbuo zt)6MSL2Hd36K&FZqpP=Dje4u08TX^JC8KajDH0}h6ITtMuFJ(bVe7;o$iq6>Zfpo_ zeVJ-j&*(brgDP*aL_}GSBiQzI_dA;H0lm>hs7Sbob^*W&oabw&RF>5?ZfKkAdgR$t zJQAAWVj2Ykd5_b1zP@+WJeJj^7nmn{UFHayVZV%?I?VyLm)2Xm8lC0lIWBmW4r8&2 z(Xo;@}6&E3je*UiiOgcmUKP+KyPj@k+Tqa9` z?14-nl;)@KfrfLeo%x7NvXzi2<- zU9F|v?9g*T_V?`8%phN<;Gvps>0OQTDd%VR&0bm&cXo>(e)#-H5Yd`t)}PmY07cpR zvrn)7FHme4R2}a>H1`DYaB4>K6Zg8FJp0Rhf8a6FDB>0hWH41|fW4j5mxn_YPRmD} z#GsDQ5ZlN2!VoQb1WDGZ` zXy`q@x`IN9Vng35JTda+v4c2|G%8q?{?~;Ax9ptA+Dh_XS#Pt~mESrfgMo1QND6+o zUEIQ+X2r$0U>bNmL)cDWihWTm;v7s&4iFT}~6M`&cEb zh>z?qxRXaQQPLrEOX+Mb#XCgITvq8obEYP zwq#f~snhG+K8&WnLff7G%*qrgi59-ieO}^1%*+a3?Q$W$S)5ssG36_(bE#n_+t=7{ z82Ss^@7Qar?_t1?Ru?hgb~W{*jo9!)t+v2^_IoLYfs1d z|5dt!!uFzfXP@n_&Be#KQ4C@+F!JmVYkS4JQHYgO@eQ*LJwrQ(cjvNH6e-D1*!hz` F|1Y*ALEiuX diff --git a/shiroindev.py b/shiroindev.py index c811989..3e762bf 100644 --- a/shiroindev.py +++ b/shiroindev.py @@ -1,6 +1,5 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) -from builtins import * import warnings,operator warnings.filterwarnings("ignore") #Seed is needed to select the weights in linprog function. @@ -39,8 +38,8 @@ def _remzero(coef,fun): nfun+=[f] return ncoef,nfun def slatex(formula): #fancy function which makes latex code more readable, but still correct - formula=re.sub('\^{(.)}',r'^\1',latex(formula,fold_short_frac=True).replace(' ','').replace('\\left(','(').replace('\\right)',')')) - return re.sub('\{(\(.+?\))\}',r'\1',formula) + formula=re.sub(r'\^{(.)}',r'^\1',latex(formula,fold_short_frac=True).replace(' ','').replace('\\left(','(').replace('\\right)',')')) + return re.sub(r'\{(\(.+?\))\}',r'\1',formula) def _writ2(coef,fun,variables): return slatex(S((str(coef)+'*'+'*'.join([str(x)+'^'+str(y) for x,y in zip(variables,fun)])))) def _writ(coef,fun,nullvar): @@ -59,7 +58,7 @@ def _powr(formula): def fractioncancel(formula): #workaround for buggy cancel function num,den=fraction(cancel(formula/S('tmp'))) - den=den.subs('tmp','1') + den=den.subs(S('tmp'),S('1')) return num,den def ssolve(formula,variables): #workaround for inconsistent solve function