From 81c1eb5ec1cee96d727a417527d255156bc0f28a Mon Sep 17 00:00:00 2001 From: suntsev Date: Fri, 19 Oct 2018 14:52:16 +0300 Subject: [PATCH] v1.1 --- .vs/comivoyar/v15/.suo | Bin 98304 -> 97792 bytes .../v15/Server/sqlite3/storage.ide-shm | Bin 32768 -> 32768 bytes .../v15/Server/sqlite3/storage.ide-wal | Bin 4128272 -> 4128272 bytes comivoyar/Program.cs | 24 +++++++++++------- comivoyar/bin/Debug/comivoyar.exe | Bin 8704 -> 8704 bytes comivoyar/bin/Debug/comivoyar.pdb | Bin 17920 -> 17920 bytes comivoyar/bin/Debug/coord.txt | 4 ++- comivoyar/obj/Debug/comivoyar.exe | Bin 8704 -> 8704 bytes comivoyar/obj/Debug/comivoyar.pdb | Bin 17920 -> 17920 bytes 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.vs/comivoyar/v15/.suo b/.vs/comivoyar/v15/.suo index 9c724f284c12d1aa4d8526394fe3be1c484f0d78..7ea98a4763798e776a3ddb2b7db405b8027128f8 100644 GIT binary patch delta 2504 zcmbVOOKcle6!jbb#_`zs&?L>Ti5sU$Ll_)Hg#u1V>NKB{CQecn1XStBemFyHj~P#r zx*I1F3l^22eyV~%-Bf%wNNqYuK~U64>7uKy$`Vyn4Nyl&I z-Fwgdy!+mGe%?0!$oiSTvdUyKaeyZq8yhg0%z&n)u{zE@f2FSMQsg$Nhn1cVc9t7i zyi-OhnY*T%T+y>!D@mh~8^lfkJZ{)wF5i4EgP8|Z0vv#!0X9G>KmefrUYKhDwSZ}6vjNnR?VH{3d?e%0$O5J zI5Se?Wtw@^MKJc({MGyRJzZ8U`Yt?aNeEENQ_l_qF>;@B+Ms%;<${j=x<4SlVqv_F4Ie}f+a-dToP5c+0Cks zOs$2Tsh;N-&@+roiEkGM-{0IZfsJ(@V|_K(u2!rP7uf^Kn93F*5Mgk}$OwH#)iC-k zIn#vO{K0|+S5QE&?Rkqf8D8d0>|yn>r({gq3w1|6l5c@E-w7^Lf0M^zZMoI&*9#3GESP#!aM>8jXnoB^sq6O;+Mbae&6DDu=|kXzHXCouNTVR#{i}51W9e z=QR5wTg!gU_KTK>kl}MNl;b%zPt%lj7Kw?a706nTBCQR#v^=3IA3_+fhm@E+tE42= zfd^B--5(p78K9atPLoP>mZ}|1C#jl*c)MQ}UlV=eA$BkOiYQ>KznjwxN}*{fLXS&v z_>IxHwyTLC;9(fbm4The25eSzX#|!=k;gxw%%~wcP7_K}))X~$czSa32$0M1NWV;@ z;r;%JDP=CG(pj0#y)DPX%3QIEXsGnjgi1q_M#KH86r*#BI=#Dkvwxh%l-V=|3mOm8 zcu1znV$OPhzhcA%nzUHB-#-)&MQ6ek!cu9J!tNKVH2Nn%5W;BWs7BRdd9y#g?LKvc zPD!(}vWpTJ(|{8HAS#EnUZaDGiJJVQ38S-)o=HfMO}JPAORQ=^RY_1)ON~HjavE>! z)Oeqv(kDaxkgAvgn;EV&i^W7N1V;-rR$Y1sT055lQ#S%&!+U&RzrcrTNPHHb>TH7&WGZ~$Zx2hvP6M=44)Cj@Yt!r?UiepBB z-8d+dlO`Tbaaiwx>c6K_XpD&&e(r+tGc!yV?qwkjCTt8FenXwGV|ZF|!>oS-@iR(M zP>DiPtP2h&Fl=lr{$57h_yu<+VC|G4F)jXPBMr;-B_vG9!s3FHq?wQ7+5BHN-QBZB zbWheom?it@YSSuVs}dL%l-*hfTP^lx6%y{ Z0RZlYd9kju-VB>bt1@upgQr06}O5&O5MGb9@kSRE>4( zA{1`xMxzH#{gMzzd>YQcS?Gmxa2_r|ALz-DKXC~`KMcTSxB^!p0fTT2u0s-Tz)cu} zVYmgi;SP)d?{*aRJ-81K;314b3N$I9WWEmM_(b=jz0-->NE6~@1v2*POO|+i7I7@0WthqYn5YqVAIhF5K zA9fW4-$kjz-6In^wl9OTWIiw6I~T1Y{2!*YZcJ&cIzExz#2e#7C_RL;)$lo={oyB> z4}u?qizXkj6AyBsQ5q~4#P%zWk*EvE)IsN&5R$DQ&E_luK&dulu7<#cRx+1AQ^-bG$=P z4fF5;-s`HUR+B6L@PO24EPHIEj~rDDrTrUaTcw6^Or3^DFaf;eV|W6Sykst!!OIcJ zwoBQ#l==}Ik7dT!iCYZ8TL#uPe4%`-0*8mfz8%x3ZC`Sa=k{zut3&dIraCFT2f U7|NgiX7T3R5FCczhej+v0O2-lN&o-= diff --git a/.vs/comivoyar/v15/Server/sqlite3/storage.ide-shm b/.vs/comivoyar/v15/Server/sqlite3/storage.ide-shm index 533549f5ed45648a45e06150a2d88d7576b23faf..2f6fb4da6f983c8b7dbe67e9bd1f73e254c438db 100644 GIT binary patch delta 302 zcmZo@U}|V!s+V}A%K!t63=9G@ft(H?-rsoIZ9BXEGV6JKQ8n8Olx?@Z5oT|dt{_!C z%xsXk|B(PxoQYxP#>Q&Ki5EU>{=>);GWkQ8mwr4$5X&7efz2Kf^?ZDGbvXW=>{gYM=ZeTunTIA(bJEA)ldyp^~AFp&96n zUWQ2w(>F6RJrtbGm!&42$dJa6%}~Hl%235n&(Olq$*asHE$D zQq=>E0)r?Z`5y^Dg_#%_Ha1o>ZhphW5;BST!{iTPUXwpDZJYcdTy66wrXPZn`LaNa MGa{4fRe%zA0O>J69smFU diff --git a/.vs/comivoyar/v15/Server/sqlite3/storage.ide-wal b/.vs/comivoyar/v15/Server/sqlite3/storage.ide-wal index 43864b594f8125398e4ae001e864fd18dcf4a1f0..3f1865738ce4e745f4fd5ec7971773e908842d3d 100644 GIT binary patch delta 3764 zcma*pX;4#F6u|MkB*Xv-TUZSHDw`2dR+VUN6a5#NP}pzWT>HTb0rOTA>XC;Y4cj7k)oM?+X;*hI(nx_Cp)DP2B6k+wIIVYX zBA`@0?)Nrz3(_E-2{kxT8_rRUhlRL?(f!8r@%o;M=EnBhr=GclAFruZ*0>WGF|^#z zCKhR=B8}_$=g%n&1_O`=(PpVoL*3>|8fouFqct|_1|f|!RSn7fmJ2VM{cVs&8q{bT z&`i7NbvZEX=pc8MY_fsvIu(I5h-X5Lqy&awtoSMg*WlMTnAfcDzhi%Wo6f1?i02Ls zF|kT-V@*Z%31{o_O-LghY5eu}qe}c`RlUMTg zz1od?P@soSVRchZ?DAoaq#=_3D%RK52F*>#gLo+PIN4Mm*6+G37x!4$EnV`<5u;su zgrh9#f!o^_{H!>Ozmb}O1^>N~)Kcqz>aNATKqxr~#q&s{_Z9wdK8`}P9~Gjg+h6IC z$OBJsZW(Gz5K68p%0JG>^-3N`OyDRQ;!blkPSC5o)~d$NWeA0M zC`2jWP?oj8%eMqaIoR^&+o>00I(nI1Q3AAc!6c6xm?Z7N{~BOj5{sixlC)!TN=cCPo_U(#t!ZdzB+^$1&C4MRG;#4{}L9? zNOTb$GN!4ySc$R8d`RKUE9pRt1*(j5%DUh7yAM|4jGFL|RH0j#d-Y7SFgv{(YyVvC z!ErPiM~uWnA!G34amGn)jycX~KS1R_iElhwb^1h|P4|P!04>V~oG}72mP5uA$aohr zj!na83mMlV#tW_n?7a`_?;u7YVibIm8S=8+tRH72x=0H$s=HW;(INCRVX}4+4KWs~ zGRB1bo**G__#S7}7Ke9Hc`WjpERh2{Gd;3Y_B3LmZuKxp8!-|Og^ZCR@5;VL`YoK% zc1m$JJL8wOsIw+<*~6tNw8xIqhOAU%eheF2H=QXwrq_OVdjIEV1Pgcx5daCR_sgCz+ zA2foPXYOemDayCue*{;FN7yO_J(gJCN7@!Y7(*fy%^g#L`0}u;j2r>d0 zgG@lPL2QsI$P8o-vH)3vtU%Tv8;~u?4rC8<0L=k8f}B9kAQzA;XfB8Yng?L%3-SXk1T6wB2KmbbKX3&R{{r0S45R=6 delta 4541 zcmbu?doo7*fAe3T6hWr#EzfCJn7r#pG*Kvznv%+s3gvw=^pOUiC zvDj7H<;%~ni_LXu>0%MGxx^;5BwMTU`?Q~rb9Ux@&-u-q-yhGvoa4M-51+%xf4_v~ zgVHjv49N_s4C!l>p#gq!Ij%qr_?O2w!y{}SkzbB`P%uBjX92IrFkeD(5vSr*Yff&I z#;}zlU-1IXS0>MolCGY`FEH0<6)oo(GHP%c%zT*}V-nDKY2rsp2ZLyH`%)vlK$?iG z$49|;;k#bJchU_9I`{Z|r`vFCdF({Q>{MOfo)1C$5S+QMD{~>7S$F`=3_#fa2zy^xUvjalRXf5CAi*BV zE^%Ac`qQp{=DtI{#c4Jh!vk+3Y!R;TPGXG7%NC}emg+iqN$7|`Wc_8pRj-cRre$Q! z@qOZFzd52TPpmx$@v#6OXZ>-SJAfz3Lv=@8stL*QN_zGzUk!Xj+ zRcq_bJW?O%zh9cn+bTVBp+ypDi+qL2@1xr$ChGV?R|F&OhZk?t`x6^R5jU}|;jZq> z^9!#oWy(de6%-vK-SYp+jjiTatfe_)OlZ9Tt=*t?611*>){oHBu3n^kNU_~j4zb0Y z84R(>AOx{v9%E+CCd#E~W(dL#M%dRG31wPaOjQwf2nlv`NvB=ml3L(Ftx%`Adh2>Q zr9-(0TjVRgP{CW$G+a%Et_Vfg7EGQM{jTB)_SFp^hf@AonkM}%_sEO!_Yap&NQ?_$ zQz5o0#GZxNpF!*xh>H;_W@z^NU+_XnHKc&Wb?Y;t=ewy>aaLmRJ#*li+sgpQ;MEsjVha*PYl-&{tB_hoEZkO$sh!=zwMlr8@8G1MKi+@b{KKTKn=%bPbzjuYyEf* zS%;HYGlp6%XB6Km**(Zl;qK`3`fTrSg~(duBQ9FJ8`!q^{DsgF5y(2@bY9`--xEgBLwQY#R4BnkEhn^Eb?u7Oi2=FKBo z4`^W%^fS{4TjVS14mE}Z*B-VLx*`f;cdhr$3SAh8A})t0rb($(abvnwYf}4z#|Kv} z`-P{aZ$B(xtplw$Kx>N5pC3kip>+O9OEzc-CW9zoPmh`RMoxJPF5)ks8rgoOGJ`u1ZuyS=_Vn!W19~aq-XeumyPqmVa7@ZRo%)?&_#hSp>dE7ovk(wXRa zgY!ZC2s;L0M` zj@X-;30-j%VSnQ$H+5sl&In#7c~-w73v;+Hh9)ATjwmD%WBZZSR{Rv z$k$+l-`2{^@Z0)zLkK#S1lroUfci^+|KN$l99dkWrfK$cvLS;0-zUJIcC{t@KR(kZ zzZSY74mk&PzHV&({%jR;zUEcJ&fL&#VKw1;EM$Myd50=(<|k(ztjK3y6aSVzZ448e z8dr-~stq_-2dTx}83&&=nZ$}U99mqh?PROaF^Y!9BkVXr=Li#Em)}a|HYQLIc0398 z#Ixy|*o%i}6&_#~oMqz!)q|2H2wUVM5~m*T>G3+_DRe{v(!R4k@)RdD-T-O0oZTEU z-ILN@`L?#{MO@j|rs#(`|F`z><9>A?8@&vnwwOZ`pf(wWp!OSYp4JmKS{zy>xu#{~3|5SoVDoD^4L4>AUA0Br=BfJ{LgkQrzb$Q)z=+6=M;aY0rf UYtR;u4d`zmTOzxBYqs})0l7OHNB{r; diff --git a/comivoyar/Program.cs b/comivoyar/Program.cs index a664daf..75a8518 100644 --- a/comivoyar/Program.cs +++ b/comivoyar/Program.cs @@ -45,16 +45,16 @@ namespace komvo WriteLine(); } - int[] toSwap = new int[Points.Count]; - for (int i = 0; i < toSwap.Length; i++) toSwap[i] = i + 2; + int[] toSwap = new int[Points.Count - 1]; + for (int i = 0; i <= toSwap.Length - 1; i++) toSwap[i] = i + 2; for (int i = 0; i < toSwap.Length; i++) WriteLine(toSwap[i]); int fct = Fact(Points.Count - 1); - int[] routes = new int[Fact(Points.Count)]; - double[] leng = new double[Fact(Points.Count)]; + int[] routes = new int[fct]; + double[] leng = new double[fct]; double optim = leng[0]; int oIndex = 0; @@ -68,6 +68,12 @@ namespace komvo routes[index++] = int.Parse(res); } + + for (int i = 0; i < routes.Length; i++) WriteLine(routes[i]); + + + + CountLen(ref leng, Matrix, routes); SearchBest(ref optim, ref oIndex, routes, leng); Debug(routes); @@ -88,17 +94,17 @@ namespace komvo char[] ch = rts[i].ToString().ToCharArray(); for (int j = 0; j < ch.Length; j++) { - int db = int.Parse(ch[j].ToString()) - 2; //debug + int db = int.Parse(ch[j].ToString()) - 1; //debug string db1 = rts[i].ToString(); //debug - if (j == 0) res += mtr[0, int.Parse(ch[j].ToString()) - 2]; + if (j == 0) res += mtr[0, int.Parse(ch[j].ToString()) - 1]; else if (j == ch.Length - 1) { - res += mtr[int.Parse(ch[j - 1].ToString()) - 2, int.Parse(ch[j].ToString()) - 2]; - res += mtr[0, int.Parse(ch[j].ToString()) - 2]; + res += mtr[int.Parse(ch[j - 1].ToString()) - 1, int.Parse(ch[j].ToString()) - 1]; + res += mtr[0, int.Parse(ch[j].ToString()) - 1]; } else { - res += mtr[int.Parse(ch[j - 1].ToString()) - 2, int.Parse(ch[j].ToString()) - 2]; + res += mtr[int.Parse(ch[j - 1].ToString()) - 1, int.Parse(ch[j].ToString()) - 1]; } } result[i] = res; diff --git a/comivoyar/bin/Debug/comivoyar.exe b/comivoyar/bin/Debug/comivoyar.exe index 7668129f3f743198953b241d2f75cce2d7f4d039..f3917ba7d518dad7b0133386e2c69785949e09bb 100644 GIT binary patch delta 1023 zcmZvbe`r-@7{|ZQd){-ld3V+0x!rSh7rED+x!K&BG#xWZ%WD*Y4lmYjGSY4Zv-XEc zFo<^_Vh!Vs|2SF{Q7~!vk(eu9BpIx}0`+UF8 z^SsY{-gDpHOmF7XL!x!6ba*8Vm&RVEHbqoxC)NW=l@@DNj%sOC^-&>J+yL`=o+)7C z%4(o}F<`MGz)}1CCe70{Zja$<&t=_SRR`6g->fuRrA4OE}Mqog^ zeov@sX9xM}fb#@%#90^fbLADE)N*}YGcQ>eXZY$5C&_8MEd9UfaAVnzL{nk3;v*`& zOL06adx$WIB6F14meLbTSZ966&Za=CW2m$GN#GFgT&rn$f^7V@pzew>s=z)zDBbsk zJV%SrW7NUKh~*%HgY&t>m^H-e_`DNKHmt=E~r;ISBY;_OXSyeXo8;239!Yrc~w5yOb}701i0^QfS^@&fZ0d71q& zIm!G|Ugi1(eQ&yc;sYPCZZQX~KM~-PB$`3YcDB=6v&1a!h+}5(5=zq@`55W(%c+E) ztrV9I$bjPxe&UO$v>#^&_S4i#x=UBSK(olocJ)K0Uzngqc$j2X;Wo1xGt7ECU_NR1 z6y`YIYWx=w6^+Omf45;CjqJRIcIE-RA@<@ugv|FbA^J?*XJU}{Q-)g%_h=?W3Qe?? z+Q`!XYIIyR)dZNoCJs8Ff+~?EkP^Y8SEqUtF?-tT<9(k&=bVR1#Gv?bgZajTg z)}SkV6kYEuEpGmL%?I24%*4Zen;-mM%&RT2l(nsFwaUky35R2^@dKcB>e_C-g5YnG zH`2@(v)KoBW;5B|QzyJvp8Gg6`gzyQjs4zVVUu4@%eoh?sqPxkajKM#Q!(6|7^HCV Rihpf!W<%(v{-#n>*?(;Q+pGWp delta 1019 zcmZvbZD^ZS6vzMPKKFT&EKPMLERRiAlD4xEYg}=C8Tw&s3JwbGw$yf|6dN{#+R4C8 zomNa=uxq=?8gHwe7F5bu3#+KlURV+4zKG%k892ZAf(Y8dm=vk7ch9})Coz!UbN>Hx z&OP_J$sKGSY@QqwnM;L9o*J>=k5XKZiR17TLVB*iNwF_rsRpNwTy?~Gf_dJljksO@!0~EcDz!zgyn*4W zJ5HR_5Brk;oAz3LSBSp!l7Vr`AEXUvk^@AT#xQf9xig_B7Eo)w#ZIb9t9OyIj*`Hk zO-1#a{D5qHzou5jDGH#2k3{#Kkc+eqeMXJCbC!c3UMl9?1#5=YSTX0%R$!Lp4aLr{o ziwNedd5#~lK0$z14J%b7IKELna1kKVi7du(#+SP1~uJEd7s04?gEdA5$n5iUtSp5q`ufeAKPZ zhAJC!^rHT~Aq|VjQOwd2nH9pue1XmwPv4YB(eFJ_TIW3Y$9J8LxtH&^c{lF9v1c$7 zQ|*z2mGM=nS0mfKrAV)+$z1xTTlWk8#(5)geJP{B?rd{*S6kV*|HChu#t&buUEcV7 spSL6Gr%>{oHgd-F(N^akk}aNlVKssNP;|uIik> zJh90>C^IfuQtm^PmtSge!x~C7Iy z!epHZuY7bWVQ-TVoUmOKTT4i~9rV51EZ?A!!jcH&Y*Y=E^E2y0YX@b4+$Ik<$-{eO z*J&BwD&qq({<)0*CA$k`_X647NsByX3$AKimt_22E$-C2Pf7m2A$u}})+1!k8Lfvn zur4Y^xfL=$&5`_&MOysE%Z-l)Z@#_hmsA& z3*|C-3Tv|#LYWF>98rIuXrV9bIFxiKx1fyD%Y|>Rs7_A}xkQc3z%cr_Ikh@sS+sfg z#?5o1ZS7boleHba$57dS!iV)iXuqL0LQk{MsiNJ^nHd~Rh`3%j$x43v~mO$LMJBerLamoC9T|AcTIAJl=<$cU5cN zL=%Y2^kF*WUEu6T3S1=qctN?WN9|3Fc-v&mgr$D~yI2Qr|2l4@E8D8*P@JyX%R%fa zBc$vZ%C1qYS6rmpmw>b2-walRTS06$qYbPTB4+HxOC5v*;2baxJ_sHG>%pUnCqPc{ zq_PLV2DHBl&IQkb^T0un{oYdcXNq4aUQ_MY!A21i#!q;82pxY0dB8tG4xnMNn0#&) zLf4g@u56p4Q_-i|OToqPuLQAcjC$}9a3Q!X69E)>YaJ8&y_6Wj()L#Erod%#vO8{~v?72O~w<^y*?F9Uaq zB4GsZ!ZQphR)OqT2kxSV(ii18T`hIR+Ta68;AS&$FNhA1SK(Q33dnu3z~^93192ja z0Js;#5lOc5g^CkwRDt`!8W0mVW`hSo>|oIeVh1PV&Qn|@L}oGoc7}*iN7*vjM3>84 zvBPlYq@D*&ASZ#NExKTHl5sFo=~F?huHja8k+Poz*>8;^Ry`R9t1Nn;Zvi_ zyVMs9drZibCn4IR?dw*iu6yoRf;vh!gDz_?qPazJG8(I6)Er8wUg4iq@3L=B-+z2f zI%S3mWMAT7=o_<>zaXTTx3gnMds7tqz%ByGuazs*TIulcbuIsWhhwY>k9Im+>B!@I zSc=BzhK`oWmOA>f(h;i0W{_fj^G0lti9RWdlL&-sEgAS| zljU`4tv;;{ndpAIT@H~a;vSo{GHFeTFx@xp!*@k0nxmj6hJKGxmK_ji$YUPaee!lnMT7UH1J>S>&^W%A* z&wW16^PDoklmX_`M#PtX_W5>3M3q~X9t#_}SaPiM+Z8kB-A(?)2&X=_qUqLKudf>T zsPUaDXX*`a(dc`hW{(w*vWUAnj6u7r^Z(|$!`_b#(}bOPb!2R0&o#y^?wH{UGhb&& z(Y6fvJ^n_+Sr$GZNBDSLe7bH%OXTwx$6pB1EyFa7|885AfDrV zBJm-ehV=9%x0v(NX`gUj%AR388(B{$>pjW(>RI0j)_0Y8Bbhggd25-M^Dc8n(G^Ya zB=0sdvu zdCk30-j!@vdmGtM*RS%_x9-|o;%RGFm&r$PxjI zLNNrc1z!V;z*FEl@D0g#K@s2?Df_@;*vG&Ua2zZJKLLf`gp{vK{vbIc?LUKMw3C#- z@$xVR&VypXa3o1g5GQE>%b~Y`>%lDWQE(Nwf#_&IxC!#xAa;my4y*t#fR)^A`#3I# z9wZY|PLzw8vdKkeTFz%}R$V?tqQo(2Te*^!fx~t#&D33uv0|%i1u=yh3u;e~Ll%{O z0*nEl1Z`jqm=21Vogj*B=M(`%+0T(0E-QW@s+ggbNML@BViJ%C~3hsqI18f5Ap!k8AlDVMpD`fb| zPxH&^L*2oX#?(`X)sVyBkrnUF7>W_p0^%goeo*A*0QdkXriug)LS78Ef_AVC#BNvZ z*u~TiIT!2zSA)-jYryA-(iH4QaRwFaMs?y+$;Uvk0E$kB_+J@StblK_o4S!qHK-%t zLg8@isSC0QvKx$$V;6x6zKK#!mNJT}`qfGz$LduQ04_oP?w#TEgDL1Ae*{c9glVyS)JeRD$s>bioJwZ%bW90YJ4Glxxs+b zX?B}*VpneF!)~KaT-k@k8!~>-ZDLb=5YGVr(QVR9>-fCez%RMA$gfb$357$0|7pkS U@7e$S-4{k_ShYWM?bo6I0Fg(?O#lD@ diff --git a/comivoyar/bin/Debug/coord.txt b/comivoyar/bin/Debug/coord.txt index f0b2693..a576544 100644 --- a/comivoyar/bin/Debug/coord.txt +++ b/comivoyar/bin/Debug/coord.txt @@ -1,4 +1,6 @@ 0 0 10 10 20 20 -30 30 \ No newline at end of file +30 30 +40 40 +50 50 \ No newline at end of file diff --git a/comivoyar/obj/Debug/comivoyar.exe b/comivoyar/obj/Debug/comivoyar.exe index 7668129f3f743198953b241d2f75cce2d7f4d039..f3917ba7d518dad7b0133386e2c69785949e09bb 100644 GIT binary patch delta 1023 zcmZvbe`r-@7{|ZQd){-ld3V+0x!rSh7rED+x!K&BG#xWZ%WD*Y4lmYjGSY4Zv-XEc zFo<^_Vh!Vs|2SF{Q7~!vk(eu9BpIx}0`+UF8 z^SsY{-gDpHOmF7XL!x!6ba*8Vm&RVEHbqoxC)NW=l@@DNj%sOC^-&>J+yL`=o+)7C z%4(o}F<`MGz)}1CCe70{Zja$<&t=_SRR`6g->fuRrA4OE}Mqog^ zeov@sX9xM}fb#@%#90^fbLADE)N*}YGcQ>eXZY$5C&_8MEd9UfaAVnzL{nk3;v*`& zOL06adx$WIB6F14meLbTSZ966&Za=CW2m$GN#GFgT&rn$f^7V@pzew>s=z)zDBbsk zJV%SrW7NUKh~*%HgY&t>m^H-e_`DNKHmt=E~r;ISBY;_OXSyeXo8;239!Yrc~w5yOb}701i0^QfS^@&fZ0d71q& zIm!G|Ugi1(eQ&yc;sYPCZZQX~KM~-PB$`3YcDB=6v&1a!h+}5(5=zq@`55W(%c+E) ztrV9I$bjPxe&UO$v>#^&_S4i#x=UBSK(olocJ)K0Uzngqc$j2X;Wo1xGt7ECU_NR1 z6y`YIYWx=w6^+Omf45;CjqJRIcIE-RA@<@ugv|FbA^J?*XJU}{Q-)g%_h=?W3Qe?? z+Q`!XYIIyR)dZNoCJs8Ff+~?EkP^Y8SEqUtF?-tT<9(k&=bVR1#Gv?bgZajTg z)}SkV6kYEuEpGmL%?I24%*4Zen;-mM%&RT2l(nsFwaUky35R2^@dKcB>e_C-g5YnG zH`2@(v)KoBW;5B|QzyJvp8Gg6`gzyQjs4zVVUu4@%eoh?sqPxkajKM#Q!(6|7^HCV Rihpf!W<%(v{-#n>*?(;Q+pGWp delta 1019 zcmZvbZD^ZS6vzMPKKFT&EKPMLERRiAlD4xEYg}=C8Tw&s3JwbGw$yf|6dN{#+R4C8 zomNa=uxq=?8gHwe7F5bu3#+KlURV+4zKG%k892ZAf(Y8dm=vk7ch9})Coz!UbN>Hx z&OP_J$sKGSY@QqwnM;L9o*J>=k5XKZiR17TLVB*iNwF_rsRpNwTy?~Gf_dJljksO@!0~EcDz!zgyn*4W zJ5HR_5Brk;oAz3LSBSp!l7Vr`AEXUvk^@AT#xQf9xig_B7Eo)w#ZIb9t9OyIj*`Hk zO-1#a{D5qHzou5jDGH#2k3{#Kkc+eqeMXJCbC!c3UMl9?1#5=YSTX0%R$!Lp4aLr{o ziwNedd5#~lK0$z14J%b7IKELna1kKVi7du(#+SP1~uJEd7s04?gEdA5$n5iUtSp5q`ufeAKPZ zhAJC!^rHT~Aq|VjQOwd2nH9pue1XmwPv4YB(eFJ_TIW3Y$9J8LxtH&^c{lF9v1c$7 zQ|*z2mGM=nS0mfKrAV)+$z1xTTlWk8#(5)geJP{B?rd{*S6kV*|HChu#t&buUEcV7 spSL6Gr%>{oHgd-F(N^akk}aNlVKssNP;|uIik> zJh90>C^IfuQtm^PmtSge!x~C7Iy z!epHZuY7bWVQ-TVoUmOKTT4i~9rV51EZ?A!!jcH&Y*Y=E^E2y0YX@b4+$Ik<$-{eO z*J&BwD&qq({<)0*CA$k`_X647NsByX3$AKimt_22E$-C2Pf7m2A$u}})+1!k8Lfvn zur4Y^xfL=$&5`_&MOysE%Z-l)Z@#_hmsA& z3*|C-3Tv|#LYWF>98rIuXrV9bIFxiKx1fyD%Y|>Rs7_A}xkQc3z%cr_Ikh@sS+sfg z#?5o1ZS7boleHba$57dS!iV)iXuqL0LQk{MsiNJ^nHd~Rh`3%j$x43v~mO$LMJBerLamoC9T|AcTIAJl=<$cU5cN zL=%Y2^kF*WUEu6T3S1=qctN?WN9|3Fc-v&mgr$D~yI2Qr|2l4@E8D8*P@JyX%R%fa zBc$vZ%C1qYS6rmpmw>b2-walRTS06$qYbPTB4+HxOC5v*;2baxJ_sHG>%pUnCqPc{ zq_PLV2DHBl&IQkb^T0un{oYdcXNq4aUQ_MY!A21i#!q;82pxY0dB8tG4xnMNn0#&) zLf4g@u56p4Q_-i|OToqPuLQAcjC$}9a3Q!X69E)>YaJ8&y_6Wj()L#Erod%#vO8{~v?72O~w<^y*?F9Uaq zB4GsZ!ZQphR)OqT2kxSV(ii18T`hIR+Ta68;AS&$FNhA1SK(Q33dnu3z~^93192ja z0Js;#5lOc5g^CkwRDt`!8W0mVW`hSo>|oIeVh1PV&Qn|@L}oGoc7}*iN7*vjM3>84 zvBPlYq@D*&ASZ#NExKTHl5sFo=~F?huHja8k+Poz*>8;^Ry`R9t1Nn;Zvi_ zyVMs9drZibCn4IR?dw*iu6yoRf;vh!gDz_?qPazJG8(I6)Er8wUg4iq@3L=B-+z2f zI%S3mWMAT7=o_<>zaXTTx3gnMds7tqz%ByGuazs*TIulcbuIsWhhwY>k9Im+>B!@I zSc=BzhK`oWmOA>f(h;i0W{_fj^G0lti9RWdlL&-sEgAS| zljU`4tv;;{ndpAIT@H~a;vSo{GHFeTFx@xp!*@k0nxmj6hJKGxmK_ji$YUPaee!lnMT7UH1J>S>&^W%A* z&wW16^PDoklmX_`M#PtX_W5>3M3q~X9t#_}SaPiM+Z8kB-A(?)2&X=_qUqLKudf>T zsPUaDXX*`a(dc`hW{(w*vWUAnj6u7r^Z(|$!`_b#(}bOPb!2R0&o#y^?wH{UGhb&& z(Y6fvJ^n_+Sr$GZNBDSLe7bH%OXTwx$6pB1EyFa7|885AfDrV zBJm-ehV=9%x0v(NX`gUj%AR388(B{$>pjW(>RI0j)_0Y8Bbhggd25-M^Dc8n(G^Ya zB=0sdvu zdCk30-j!@vdmGtM*RS%_x9-|o;%RGFm&r$PxjI zLNNrc1z!V;z*FEl@D0g#K@s2?Df_@;*vG&Ua2zZJKLLf`gp{vK{vbIc?LUKMw3C#- z@$xVR&VypXa3o1g5GQE>%b~Y`>%lDWQE(Nwf#_&IxC!#xAa;my4y*t#fR)^A`#3I# z9wZY|PLzw8vdKkeTFz%}R$V?tqQo(2Te*^!fx~t#&D33uv0|%i1u=yh3u;e~Ll%{O z0*nEl1Z`jqm=21Vogj*B=M(`%+0T(0E-QW@s+ggbNML@BViJ%C~3hsqI18f5Ap!k8AlDVMpD`fb| zPxH&^L*2oX#?(`X)sVyBkrnUF7>W_p0^%goeo*A*0QdkXriug)LS78Ef_AVC#BNvZ z*u~TiIT!2zSA)-jYryA-(iH4QaRwFaMs?y+$;Uvk0E$kB_+J@StblK_o4S!qHK-%t zLg8@isSC0QvKx$$V;6x6zKK#!mNJT}`qfGz$LduQ04_oP?w#TEgDL1Ae*{c9glVyS)JeRD$s>bioJwZ%bW90YJ4Glxxs+b zX?B}*VpneF!)~KaT-k@k8!~>-ZDLb=5YGVr(QVR9>-fCez%RMA$gfb$357$0|7pkS U@7e$S-4{k_ShYWM?bo6I0Fg(?O#lD@