From f1bb9505a80c0a8fcb7c8ddd3dd14ad564b36be3 Mon Sep 17 00:00:00 2001 From: Joon-Seok Kim Date: Tue, 4 Apr 2017 04:03:17 +0900 Subject: [PATCH 1/5] Added README --- README | 16 ++++++++++++++++ calc | Bin 0 -> 11920 bytes calc.o | Bin 0 -> 6608 bytes operators.o | Bin 0 -> 3288 bytes 4 files changed, 16 insertions(+) create mode 100644 README create mode 100755 calc create mode 100644 calc.o create mode 100644 operators.o diff --git a/README b/README new file mode 100644 index 0000000..68b2d37 --- /dev/null +++ b/README @@ -0,0 +1,16 @@ +# Simple Calculator + +This is a buggy application that will be used for Lab5 of 'Introduction to Open Source Software Development.' + + - Fork the project. + - Create a topic branch from master. + - The branch name must be your student id. (e.g. 201624000) + - Make some commits to improve the project. + - Fix the well-knwon bugs. + - Remove object and binary files. + - Add .gitignore file + - Push this branch to your GitHub project. + - Open a Pull Request on GitHub. + - The Pull Request must be submitted to master branch of Classroom-IOSSD/SimpleCalculator! + - Capture the Pull Request and upload it to PLMS. + diff --git a/calc b/calc new file mode 100755 index 0000000000000000000000000000000000000000..023ec18849df720f42caff96d245271e7596b5b9 GIT binary patch literal 11920 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 literal 0 HcmV?d00001 diff --git a/calc.o b/calc.o new file mode 100644 index 0000000000000000000000000000000000000000..e2bf1e76837b7b2d99d8b1515a8dafe76381699c GIT binary patch literal 6608 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 F|Nm%fAxQuL literal 0 HcmV?d00001 diff --git a/operators.o b/operators.o new file mode 100644 index 0000000000000000000000000000000000000000..71b996c467c636eea2a5466488a72a5e4c372d7d GIT binary patch literal 3288 zcmbtW-ESL35TCotCvJ?B6p<)M7(^)%_-t3H=?5u>5ZVd|6)5lmO3(JiHnH!l^SKHi zfk+^vs0dLBiB>`i5`RE>$J-Fd`Dn?9HCno3oH$B;W4*W_~+!yR&ot zWc}5bO~U{w23&%HCQ*QeslmJ~re&Ci3~XLG`1N4#=%ClXxp{PRy>I;T?oSG~e)RNu zUqc?edknhs$6o&cnWr%Hm{@&EBynO8G@5NFfa%m~U|2f}bdu-Bw}e`Lr^pWGtrlu$ zVyyvVW8+OPgmGdR6Y3&!@ghIOiwK8!5!M=DwtFowrd9TQ%>FHA3x}A^S_39(%^P6M zsO*Pgc9gs@#!S{4nDMM}Dm|aF(o5-CV{S6@Fo0S=EX$= zGqT1ZvRs`v7jTQ8fK=*I%EB`p7p!z5YhuKTnBz0}GexdSU7)U>k1+G&B^*t79G`~q zS9%7YqUP|B4e&c|;DmnAwX2c$bhI)mCl5c(AJ+4Sy~5!w(?r(gjm_*@v6ww;uh@m` znL@EtC>73UbM3I_xvO>8bAx6TRVS!6R(H>pa;24QuAa?pcSEPTlj{V2=vFaSt{Vov zSBG}f>vbXD@Y`U1buD_Fi+YffS9jEH%-)y!!EqBdnReLQ;aX8n@Yik#>PiKSzABpgJA)Wc$T$`DA z9UTxO+jC?@5d|vkuMO<)L}t8~DAK+$uz$pMQDoA7EwZ!e*g)5C41WLnm;nJRu~QHp zAK(zpLQ9fZeCKtW1rs_XbPFa&;L{`U)ChcL1fCv&AL~azE6geTAkTM}ajDCuf)`cz zKgkhfyI5lUJmazv3{@O8yr^QS?@;%Mcjy7+sk zuIl@iHC*O-UBhLb`x-9u1iSlwJ9H{IhCwtoZHtd{%N#PUH(^o5xM%B6i&up){L4e zK9KZJrc5M7?sIWQ|8D^3K9ZljL-=(TvWicAO)~t*;65pe=)QEnbd21e<)SVqT$<{> zuOOC`|Id7&l27?lH`ep7C9H`M)H(hYQWVkSZ=o$IexKvZeWLi(PxSa5#Ar>KCr*Xj z<@jGnfJYf$jvpeP#J|V|b@pHQpD|x^gN|O1>>%Sx|2xd*bR`_~Z^uY9k?$|zuW^#J ze;NLCUS~(zKl<89zPhhTsdkwEJ@e(D=TEwxJNZsgQYg2XK;K3BhU)R@Oq1e&$M@$^ Jw5y`W{|DoA6BYmf literal 0 HcmV?d00001 From e72ca79fb67d77cead0e521acf4c7d64890ec69d Mon Sep 17 00:00:00 2001 From: Joon-Seok Kim Date: Tue, 4 Apr 2017 04:09:22 +0900 Subject: [PATCH 2/5] Rename README -> README.md --- README => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README => README.md (100%) diff --git a/README b/README.md similarity index 100% rename from README rename to README.md From 98ce7f373fddd7fbaa759ff477c4bbfb5132b364 Mon Sep 17 00:00:00 2001 From: jinhw0495 Date: Tue, 4 Apr 2017 23:12:39 +0900 Subject: [PATCH 3/5] fix bugs --- calc.c | 17 +++++++++-------- operators.c | 4 ++-- operators.h | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/calc.c b/calc.c index 85f1466..dd0542b 100644 --- a/calc.c +++ b/calc.c @@ -5,28 +5,29 @@ int main(){ FILE *fp = NULL; int operand1, operand2; char operator = ' '; - int result, line = 0; - + int line = 0; + double result; fp = fopen("read.txt","r"); if(fp!=NULL){ fscanf(fp, "%d", &line); - for(int i=0; i Date: Wed, 3 Aug 2016 14:02:40 -0700 Subject: [PATCH 4/5] function pointer --- calc | Bin 11920 -> 12088 bytes calc.c | 16 ++++++++++++---- calc.o | Bin 6608 -> 6984 bytes operators.o | Bin 3288 -> 3312 bytes 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/calc b/calc index 023ec18849df720f42caff96d245271e7596b5b9..6b46e5541fe336321c89bc1c24bf52d2ccc47765 100755 GIT binary patch delta 2404 zcmZuze{54#6u$SpzV_a2^le?C+aPo!{8&e~ZZ0?xA{+Sd4FwS#@&_OgUZjrtzJE1nwJkcdRU8>^y`D# zFp6H#PUjA4{pdny#A&S2MoW`6rX}qdN}n}B9p}t2#XA2@BtU0a54|`{)cp@qSlwRL zuSc}uvnmku@L&&0#`1wUs11-HfXmdNwVu)2SDyxY57H~cV`pu5uef<9kx)O?POE48 zL-Bn^_zBB6L;iz^iOwA5Y>0gS9Z6ETEF!e55JPYlpm)EB9vHPXxN3=5__&Ep;MYNttZ76#TuB5B``e6@-IzS{@@Gy|{Nb8Uu zZtcFNrfc2d3+HA+Z#|S0!(J?d&O+J%jcEO$7+srmb$u$Dw3VS<~N4R$VAx8S@?8on)-^CDU-cJT#yjj*&AQl!F~en46=%`AUH z(=3e4f{+&_L@#$rx9^CHd^WuzZgHn=6t0p3si`GZ(Sno%vPid<)A8t2);x)ph~4Qf zsh5hc>5ObQP$hC)CWPTCf@c-SddND0Z$jK;U`F>qA!+9TY?KJ8GnX4-qdLO_nHAtj zBM-qWGs_UrWy=0SBw5N3nJixzLGx83s4NC!GAaJX7FeKM03^kc5b~q@Cxrtp??)fx zR)JBNnH@$*&2eP>29v4yB+QmyVH#1c&V|z04)B$0wJ;M_0D8*JL+G;O7>}c$&gKD8 zxrKffvmxhi^mExJ;_Q_t5TV6+wpP27PX%>XSt6W3U26PP{xD+D&W5=Mr0>GqUB*?x6boUGV*&x*nm$I0v04 zgX)I}S(5xwP)$R~eV`hO(}9AWTi7wdzHzDlLgNs!_~MJ8CeurpG1@ z_$=Vyu=)v|k-W+$@ZL2ue6(d|a)QagILg@2F(x1cAdrED9F^BV6g^{t)B*5GF({kJ zCGaMmt+14Qwx%9INa45%U#Z6HB~*SETqhGN?Tgbwz@}yllrj;qFO@VVKDU=VDtZ0S zK_6~VpZe(n5)RshQF&)m$pk^_tOxYK6xs^4VMn5L`Zwtr)9Hfj%1jCe)25KhOktYg zPn%0pQy)o{t)O;YygH+A(eoh~%<}B&8y6^ z{gP;QEV56wX+IY79NX?W)>{1iG12Fko95lwS{v{Y=(w&){N(WEH~1S{cf$#(Zm4N~ z*4Mn7R98M(-R!IJR{I*gB;arK5oo%uDf&v*9I7<524G!x_Fku_erJQvvu(G}6R4?O z>{;(`XbSjN)C9J*25MS%HjCVxrDAlJIl3ih9i`*q)J#VSfnSz;hfFfa zgrve9wGk_66X$cc+a}+v?un?zq7UcYu+W!9iOa*sCtlOz!tW}}m{c-;cc8?D;*`si zGFdZ}^_%NK-Zs%%ThvuBDADi4Rd*Thou2HdN|Y3qaVx$;U@Q~60IkkSqQl};VHy2J UTrONjW5QLmOsbzFb`;J34&I=X%`WJqIQ5F7NawYS&gnD zlXBUjhKXB@Tb69oHQ9_NfSVIdjL|J_I+-z>TTn6Ll4+f2cg`zihU}(2=X~dU=iHxn z-hC%lH5WIhu;yfM+EJy|NVL)Fz1A6Zfd|0_o~s!bxcH3z65~4d_z62xu+=L@x9FDK z=NtMK?h^aiRfP@mVtrdA0L=i^?$c(mNB+Gb)1fx%l2f3L>aqE=y3}r4KNdY}yKe5b z-9oeD2qbhK1<`x_Ss(zse$~CLpO|(M3TaKtZmEs7{*EuPtf%_~ru3>n?6&oxefuH^ zwWeaHPXhtBt&cX^ZspkeOnWB;0s$?eHZJlz)Tv?GQM%+_yBN*qsh({E zo_c?yZQ#J8ZGO+C;_ud&5_iH>gyb#Hdn3;i$Xk|IRM3=sLpGCTYEwGurTLzR`JO8U zseh>MKCYgAD)sIYU+^vS97f2aW2BjdpcVK}8wdp2Kpz2J1^OT??hNRsaFn+|N5bNC z@Q7XjodkM@a4Oj>b3lBoWYA`DS(#|L2&v@|B6;BvyV(4ZdTA96GjK8%Tn;QD5{!vV zekNWrj-!u+-Iy442WE+d&`?UDZ;x@8)G}hVhzQT6t-dAU7DlIujS;D=oQlhIRKjFn zGm;_^671abhFmN_UV~^{LlXFP8s>C2tR)N^<`DeX=yNr7val_9* zmneURh#3|j(iwU*ryiSAVlvLH)5*^DE=Z8CU^ZnCaXZm`L`egYcA^dCW`mNso@4V! zRBwO^>@nE7%uhfX{swVXevky|yclfxuQHH?=KxQBgq_7XHj?Z|JA!8bQGSeeJhvd{ zAGFPUF>;=uox*R^5da1dWb#eoUSwRuLQEqRU8)j+fNG#nNyJ2^ffb4yfsU>O!fHi9 znx2+{TBq0%a9Re0TE&bYOam?@8gs&FEvU`P4Fpki0jM3yETl!#A_C{}juMBfjiKwn z=~m7mFP?4&@U9Yvz(TizYE~RbOQlT!_A8YL(ll^bsY5VH1D`5e5KPv+;2+*Nw9NuN7QUvIP#G=eU2Vedrg~&EZ-J@$IaFxEBcTTD0_I(43PZ$$%oQfQ za6+gk;@n`1{z(WN9gJ`%q2WR9N<#D;-%pYZE7Or5z#8oEIu`8kp%(#JFdo34l{y@R zN|j)qH;B%doUkfjQ$0FrBPO;=@mK4M7nfQB?+X>UL@hGGX3~mvo zqxx6%QuIj?h?^c0+CWUZ+uFX?+Fqa8?iFf$lGqaOc)6syw63zEZX+qlUtCgGQR*nE zSnnWJ&h-_%oHFcF6YfH;3tV^BMwN(}KORLK3t4dupbv`*^ zJQeAqH;eB_&-CfW6w&-vxQ&MoiA0dY|Lcz=q0i*=ITDE?X5U9+cQd#MQxo?w_=cWL z#9Q%p;wuc!eTsR3W%xvI!()sh;r|`BIAEU0;F)}DelH<3JDw+w5%AEEY!*(-+NjVK zHhIu{-{AYr^3XuXi)*P?B{Wg1h)m0l3{^Tj_?b@=_B5+8vs&=!DlUR(9U_%66b3`lKdORSH!y-*ckX*9(!K4{ch5cF z&pGFvdvAG}STbHeSS^{|8ShKstwDdfpsJcN=1(cPx~%__GJy`esGO<1q-4bsr5j{# zlAR>`NZ4~?`bkWhoKhzI$z2o7_F+B8?ERaw{4r4`Mdl0tp>(QLs7J>V#yUfx*LqU+fMS zpXX^Q=jDiutfd^X#uueg4jHGL{{ep*$CmC);xPNZGanq2s>&s=(>zwI{h`aG0_kNj z8KTmBjtg#DYce?R!0)E2;$Tm_Ez-dP!C)u~QejtNSGYUgkL&Kj*~VaaM<_ZxT-d~o zUGWHtkIe%WzRsSm4qtnJhc6OnYw&FfcSR!|&4EaJJQ9fY^g)lsS5{Y3xpdL1i)t$u z*Vfh7*4H*L7_wBAtCzW|)V@z@E-@KS@!~==Zo>1U)zA4Tv=miv2W%{oxh!U|y9(g# zA}6mTeHphgh^P+#L&{+#d_H zZ*Ohy+};`rgd^f67KsT*5kBgLsvcwYWQG3xYH{5-L$7j>Bg~o^plpV|4g$q;Vgo5w zv_^a+@;8$eK3*z&Hm!|b()0164KW5Zqvkttosa*5^n83N`9qrZ{wHA<{g>twWJ>r5 z_LRtc7(Ojo={ZU<`E80=@mzwb5?M-0U@cw4n_*+A-12}zS5ujM=o9i=bov&GpLs4K z#{nlxWsi~Qd%CO!xP|m8sWZ<=t+v>1ZDu zL%NP~ujuGEa7|Ep?;Rao0^BZpf}}pvQ4`eJWyspiu)$vK>7*J9=}q}lTnHJgv4C>l z)X~r3Jkq(88_>}mFlCqd3a~hQp6gWMkS^vO*yxZwHKY#d=y}+KbQ9%X*3l2(B+|X4 z-qz6++(J4?>R&qgF*wR(k3yZxWb?aT4XcoTN$LU}oddl{<5ckt9i4<@NN-cm2Xr(F z*UEf}_laK7(Y>Vqrqkag{hm%gP5M)vUQD_fKjdQM_cd2@6U?mxpJ;%+qSNzVi^V#9 zjN+R}7iS@Q*h_k+F1~_vlWK?em2VRt+bQRAUIJcMqx4k$A%Wel>ijb6sU+?_mnXomTM9YLteo;^z!@&#K{8IDtZw3+|!W;sUQ{C2HF|E6pWZ;(F+H GRr~{{ozt!W delta 2106 zcmZ{ke@q)?7{}i`p!7;u)+0R!4PsF1ian1@AWS>w#y;)bOKS1FVq?M&2J zXBSN^WOR>rsWQl()V`7YP2Dg~NjK;9VkQn9yN)!bXs!{s~3%>8&dy`$}o8J50 z^Zk6E=Y8+J>wDcjyK}6P9kZmXx3oKh-c)WyB|^xX6tk|Y-WhQX2WVQHFPjmU$n6yA zz98K)>9B9jn>fCPj3*I;!_lXgyeV-lJz=q}68`JA#55XP@Q!xOV|q)Xw@c#l#;L1` z?2c#&?&A50Y<1ML5=vxiqos+gBkEl_Z2UyTp4pUmD>;{(ktR!u%PZpl=(YFP@2`%f zc6TiNhf=ZSmgHJ;T6(Nc$+D&C65=Y85|^69RpZFEjg1Y7cvBtOpm(PpRv1@qP>1ZW zl`UfeldWu=jR)`+kj9+dnuCy`X8{0XOwhJ7arL3llMgX#294jvnUT~v}X}a<$Y&EHQ2yPCM~tfLjV@7Jo7uuX|6bqX&o1} zr?0RTX4Y=e9(0o5A?-oL=Cb9a%Nbvp^l ziS!S5M|vFxB165y1O7m_JK)8F4KOBgK{n5zKZ{5c>gwy9 zWe+)BZl~MX1ebIbW@+DA3`K9SdkQrWhU@FmwzJ42AlmJ*cyDIO-4db_S02cJ}x~VX_xH z;94OcchcR_;V}0MdL^SNsJuK0-(0CvQpdzfN_UrM3doAlyM`rnW#-Kecg9`Ng6T`N^7|_KCJbVFhpHc|Xg7>wdWhzJqoQxa z4NUjbd8NY;JCrrI0%PKZ12kt{m1_i-iDzDgc9TOGq!nuEJW2&Oq;Z8(n)#TDrr;W; z4w~y%(Kuvq{Wjo=9fEQ+oKbnYz*o!*ja0p)qO))U(>6N$S1S4zT*fp_)t^-KU0B5Q z1F9#U~9Tn<>7EDK|TBD-1Fo@|%TKQ2G{RhS|{e!Ogl#0gThS||1 z{nfGKYZZ;rtnXF&UaJ2BJ_}#bG z&A8vnH*@Fd18jqg&J3^cc23#gO8Ag()*T8Tq-X`pLzq`Z8Dl3)vc)roPp)M17u1J(kPGM-P9P50e2{HBBV+JnK^Ec3Jsc{GlP7QF zum_SKIqW$nLtSh#*^<+qQDJf=r#a_wr~!pw9cMUI7%e7$1j;^`Y{+HLm@&DK%YO0) tZjQ-2xGXp~Kzz^830BL)t-@$I*^t|wF>i7qcRi!VRUCgU9D`~pL$B-6wkAkPTS%b0wWF~eAo(O#07!;0IQTV2vqSddYO-9ciylO)gp z9Ux``8^i%M4np}&4rGd8nm=*!YNk-R+|0bvVg~(;{M=Oito;1E;?(?X{qX#v?BasN zx$K#KuuVS2WyiT5 p;!lR2$%5SGjMkGqx$T(>n1ObPO Date: Wed, 3 Aug 2016 14:49:06 -0700 Subject: [PATCH 5/5] function opinter --- calc | Bin 12088 -> 12072 bytes calc.c | 28 +++++++++++++++------------- calc.o | Bin 6984 -> 7064 bytes operators.c | 6 +++--- operators.h | 6 +++--- operators.o | Bin 3312 -> 3360 bytes 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/calc b/calc index 6b46e5541fe336321c89bc1c24bf52d2ccc47765..516dfa9648bc37accb8f3ca384944b204ccc9a32 100755 GIT binary patch delta 2610 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 delta 2312 zcmZuxZA?>V6u$2*lv}}>WG!TVgTuF#RLQMIwXtEzOVLu?tn7ALp;^xkK?^*-@Rn zRUW$`-%7`qw?wPZ#PZ|Ib2bqb`uLuW5KDUHkz%CEk4AXJo3pjj%jKTtH{?i zY&e4=PqKf?ljy(vNG{PXCvNML7{zBa#u3*hSyD^K=h@5JqChd*WzLqy%s?z4ul1k%THpeMb>fa5pi3b6xuqlk|i}t zVgCDiVUJO%fJZSg)oO%=26@frL*JW28USZ zl*V5${xB589Pv4BEMajA!vnMKwOX98m{*_c^ZNr~sE~SUdxD|^@bDF>h2{42cVpgfwx1!BU*pi<$IjxCQ{wI-t7U{0 z=1JI`I$T}gVQdV7h3l9dB83W5bX%$0b-LZa?b)L3G3-Rpdl0ZTze)%k4R?eDuQ%9t zw7t368|Z8Ig#tpjHyDZr5blfm+Pl2%on795FWAjT`8+qc3UKRhM2`fai9E+w-wmF3 ztifS_aiRL^8laTU-0g#bA|=*JNIv>p+#JEq)b@F9Db(6s~MxmA!t)=6_rm~!{R1hQRJ`I3n} z2}{T>5;|gHdttp@QTI{qjEVgg4sw?6{l&z-2m^Md(NE|T6Kka`iE8ub;5!M^_6D_+ z*m@IN5B5?;-Ac9gnAp!@C$bwU*JomnL8Me++aXcfpx&bj=S-TnU=}NECUnTeP5^T# z>YJ21ZDQYpMu!4z4#_@eViMp(W)PXbOw4&mVMUEPR>)^(u?r@U{ff}7CbkNeknN|6 zub9|*SnpKSIqLO{i4DU+X9If|22k?>X?`+k-iB*V#de+86_|A@F$q7Qd}TY_XoNzU z3BN#ijS0{GuWvKqqnu`-vft;on}g_SawxT1f>p}HUk z_A51O!%vhN+X@Y76W9wJFoQ@nJ?s~-qPT2V=@a3B=5iOCfJnKUeGS*j-Quzn9+mH~ z{b)5Vd#o4Ouhy_yh^TJcOrC*Xficy^j>D4bW<$_e;bvDMg0=;&p*;*s6>f1pAGTHQ KU?mW#-1HCWpuaEx diff --git a/operators.c b/operators.c index 95c135a..6303f61 100644 --- a/operators.c +++ b/operators.c @@ -1,12 +1,12 @@ #include "operators.h" -int add(int op1, int op2) { +double add(int op1, int op2) { return op1+op2; } -int minus(int op1, int op2) { +double minus(int op1, int op2) { return op1-op2; } -int mul(int op1, int op2) { +double mul(int op1, int op2) { return op1*op2; } diff --git a/operators.h b/operators.h index 4d5b2f3..2bd3672 100644 --- a/operators.h +++ b/operators.h @@ -1,4 +1,4 @@ -int add(int op1, int op2); -int mul(int op1, int op2); +double add(int op1, int op2); +double mul(int op1, int op2); double div(double op1, double op2); -int minus(int op1, int op2); +double minus(int op1, int op2); diff --git a/operators.o b/operators.o index 6b5ce522c3f5a46a06455350ca4677c35030cc63..b520415256da2de57627b7b402fb8487ba35f86a 100644 GIT binary patch delta 926 zcmZ`%O=uHQ5Pq|p?B-?DY|?^plR|s&C)H|I#EO<~YY7-Z=pM8pRw{&=5Q$RMgCJ25 zVd=$XL@$BnDD>c=2R#;hX>WS!L69O8Ptp((a_GT%o3}L$Ixuf$zWHY6z2P;idiqrs z=DeYyoAc(*YSTQnI=go5vb*g*-E|+e7IVADbFKem%=g`?rkTvO=(yTwnhD|E&NXJ& zhP~H=)iV1l%AG=if!Yc6%PiCcs@{Kang|QzD&9Sc&g?}+7K(%fIUEX?Di4_^e9$_3 zr3FL+wGVW*dnL4e&9ns^gLF0H^91wv9+U4Q%BaZnLg_Jso`272&+wCqS8U%`Msw6X z35Vl-h8oYrlhCUtQuL~mU|T9~!3i@?PdUU4W86?9jA@uuGG}!^9l2m!G>%&NK2bGs z@a-jwE;&r9kTOQ>4k@FfOzXc!mNrM0w(*^^jurKY<*#)zo_MKD^=LCOUDOC{41cPb zwD4}p9{wr<=Jl2DY6T|!YRV@`dl~qZf*vfG9^&KY1V|FBQ&_=w&7ESNDE}eOM_c{>cWGmG{~2L??|5iGZ@1kS_%5m(Nk7X@k}yAccIS8bKL|e zqZb*4Wm;qkw<1~T4e~5smIbHK;iJ$%m)rcS9J`2L2%AS9wUva9SEA$a2HmI)6SzU= tH{^y5cQJ3+N=>ES2e58rp^h5_-#{L-;UnhhJdbY7=AXmuQ3G_Bfj?Mfpp^gs delta 812 zcmZ8fL2DC16rMM`+1=Sq(R>ZwMKESL;QuCW-y_6x5?HC!6DJuwZ9}9Aj<$ECWNj zJX)pbToN^yX{MU32P`E8U`dW%dF8;)9(jWzF(D~pt>ASiJ{e1hzZ0VPubYY*jNfTK zWH2%dN8?1ECq zGtv3W|ME9fJ|2b6FCFB~7A)$^$Pp*cfazGzx1jLT$7_&ZQh0!esqb(f_pQRUEya=Z zlYgdby&uALt^N=msJNmoz@=D_Eu*j>!8mT)g$b>Fs<^U`wBTUh9tEi5p;HBnN0=49 z@|J}!PzlcCwy44f?21r)QjP8*xK)_Pzzz8i3m>}+(7>)6LKge9?_uDD5a6a4@|Hoh iPvBS2hjr`|>|>A);RSBe?qD|^icb7o8JnWBO#KCY?}AnU