From d489736013bae24abe51128c50c422d4890f5fef Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 24 Aug 2012 15:44:31 -0700 Subject: [PATCH] Update AODV test traces to random variable perturbations --- .../test/aodv-chain-regression-test-0-0.pcap | Bin 6618 -> 6618 bytes .../test/aodv-chain-regression-test-1-0.pcap | Bin 8960 -> 8960 bytes .../test/aodv-chain-regression-test-2-0.pcap | Bin 8350 -> 8350 bytes .../test/aodv-chain-regression-test-3-0.pcap | Bin 7392 -> 7392 bytes .../test/aodv-chain-regression-test-4-0.pcap | Bin 5050 -> 5050 bytes src/aodv/test/aodv-regression.cc | 17 ++++++++++++++--- src/aodv/test/bug-606-test-0-0.pcap | Bin 5452 -> 5452 bytes src/aodv/test/bug-606-test-1-0.pcap | Bin 6788 -> 6788 bytes src/aodv/test/bug-606-test-2-0.pcap | Bin 4890 -> 4890 bytes src/aodv/test/bug-772.cc | 17 ++++++++++++++--- src/aodv/test/tcp-chain-test-0-0.pcap | Bin 34714 -> 58712 bytes src/aodv/test/tcp-chain-test-9-0.pcap | Bin 18158 -> 29996 bytes src/aodv/test/udp-chain-test-0-0.pcap | Bin 35532 -> 35532 bytes src/aodv/test/udp-chain-test-9-0.pcap | Bin 18954 -> 19034 bytes 14 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/aodv/test/aodv-chain-regression-test-0-0.pcap index 16c556e64ab6a988da4b906a20607e451bb4f5ac..56b45336e0844b1b247bb3c72d38d49fd136d4be 100644 GIT binary patch delta 467 zcmX|-ze@sP7{`5|yYo!F%epI1D1ZC`l~7x8)FM%!?nQ)y+)!dmMA#1(lcw|mTbdfA zC@Zq1A=(@Q8-t8~2|2URwQn@t*hN z7#D{wUwaE)aT-iFaZmD~AoFF_nk1xv=lmc^;*=1;CLbr;*zNFO!luDY!z5d_B!L32 zYZVUk0}TAgZs2K9zfAPfp`$+r%IN5wZr&j^YOM^*)PLjWju8L= delta 478 zcmca*e9L%(408kn!{kPB`H6OJjK?SM7g3zJ%#GdBo6ed?Or!hShfSYwua1x6j(*hx|o%4hz=drXgNy&nFUt}kr zV^^4L!kWg!A_p>N@)p(%<_sIg$rFVoCi9B0Z?}ibU zlli$NC+BfwFlSjIl>Xo-U}QSO4m4PTl?mvFWnlFyxY8K60o6A$$C)G4ZsG>2y$4at z3{<-VsJ5N)1lZh1ycx{T%n)jG_nBvkA|#|qMgi?O<>6d?=AMnx%BrV+O#E74}t zF6_ee?z$;r$wCCh5!51zKUCeNUFkxjR0{qh?%e2mGt6``JkI5u@16UY`N{do>t)zW zx)nDzMI_W~)oyQ+EOmd((uay9O-TI1j>51_Y&cGFqEM3gO!`JKtyuV(*i=(P-yNOd zA+TXx#j#8&A$)!8zzlp$;pJ=zr{y?IrFoEbR}~zI+4O`KW>-~)b1@svXlSK^>;Rv| zW?*ed!2CWhhurxX|V@6;RSSpYqR4 z;+w>Ns^>#WH_fml+fdC%ZC~ZlNm;lcyYP58VmAt$(13C=dX7s5HZm5jC@xSlnr@rC z!vg#xL)#1-BNuw&kO?uW_R^JkG6^|5{O!)Ye z!ig5%O1tDDW;K&MzysPMxsA0P!@kynt?v=)$&jOn%*mucRq^zYLjX68JzibE7eZkd zI-CulEFp#hT*Gxf6Yvgfe2KuLc}EeJwi19}<{Zz>^PcZ`PZPYLic4$(Zsz=>XZXi&TO4$D zOp=;B+C=dmG|R_e-$DP1yX6*ScEaA?VY5x(+;*sOtI~tHPmx@y_F!WWO7FbI-CsY1 P8voXM@cMlupVyuLzM$Ub delta 805 zcmX}qOK1~87zgm3Z&GVIDLOUI`^}PIADihZkA1MX?~N@-^?M+j28p6jiw8Ma5%vOZZZp zhu=N}lML*g-{|5Ch2nxkm1$s9-Uu<=a;UHsu(NlAsJIw@Pf*M|b$G_N9!ohBGL>Q4 zg>Ri>@<<|&cFR{Oq z4?HI1iHQOaT({6@NGC0hGN*C4$Kf1q^Rv$!ufw5%4IhYT)QI#aE%*x_a=NnF@ zVZ-80MgNiw@>()4FdvYXjvLFqy4p4uwnPqTsw#wayN1#M%H)Qjk;6j6Fh zq9Ez=fp{>f_8=b2sUTGG;7y_@PyQ7|6r@4%pom1Nvm0a3!|;B?yzj$1GqqGLwaCd! z$CxE8$IzXn!(@;1X;xYHNz#NQ7Cx3WoFf*519(&BFw8J5oA{ns%0brg)R~5(V8K_0 zmdur)B1u^h&f;Eiunacn3YHm%i;4(q&Jx2d)Pl=F%+d^83t}U{;Xn^gaTDKB8$ux$ z1FIp|ji-ELP!3}*6b}ogbhftxH~bnt_t|i?52OAJEcd&ffa|$5;3cd6F{L)pDLKP+ z{N^8lLxUcDLB*V+;W^4MA1FXY^;)c{orW^A$Xndbj*u@{Vg{^4@eV7(-I$l&85h0` z2!Q)2yLEgZ7on2ycF(vV7vT+e@2qS!BxzoBn#UQg;c&13$srH%V+ijB*Xb>VV9GRc zwI@a6If70ij%$Ri@X#cXeR#gNM2_M2UPHMpuGR&OM+)RRRwD+vfDa>0+F))piBI}$ znx5`rw)K0Mg+Uj?)c-O2RTooNUCdLpNk0eLm=~LD`s!pCvnwhvRjkBIq>eGoP+I@A zIj$ANGdc4u(+Qj22X}v(UL|dh%54yzF~#%Xi=t`d;Y!RC rNB3l7vnOXpJo&K06*~7PJem~$zk!Ph6K{yo{N;^5#W>!=33K{4K8(wv delta 740 zcmY+BO-vI(7>0MgrQIE<6l4pXb|=(CJz)<9@FyyCiN+Ab*bu`-3mi&fV!RlFUOZ^1 zVvIEJg@}MLk&D8`i+>zEVZ@7GXwqOv#RxR@;@^dX(_O)En0ddMdA}#`%uFSw5@R-7 z$jU*so|Td8^cmKaEe-Og6`Izrse!kqzz~bGC7i1kezm3D@}tX)VU@-CjN0&QvxY!3 z#VKhZZrc31scAjR+k-ZB@R%GLHF4XpDQBu?k)1ZMSC3Pkqet(iBFB5bO;0M(YsXN~ z9lBIi#?WR}*^LVoEwmUwUm(1z9AI9}9$fkaK2RafdPM-=IY!O2d%AyrV(c?IAok(z#Oq*D zA6?UsjW*(4jYEO9ZAw$EqFlp`x(vGm!;*Yy2j!HNW*;zXNj8H;tEkU?^C-EHLl2H` zQ;yXu%3a(KXV?T9gyicxDCb3*ea5_y>;>|osGnZ-C~Faiz8~45peyR=Ltn~A{d#A? zvsku6>MMHf0Xh*vOb$?g*p+0&l{ZmWQcbSh>?n)g`medU(a~#GJkYqRSC+kcv(cg7 JdG)9l{{r1Z)@c9$ diff --git a/src/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/aodv/test/aodv-chain-regression-test-3-0.pcap index 11f17e08ad0cfb6ac6399d6eb04a979ebdcbb4dc..7f301f78ea6dd341082e80e7edc6ed29440f3106 100644 GIT binary patch delta 665 zcmYL{+iMd+6vi`WHoKc>+uS#s>_Up*1(a%0Xc42%gA%pf8jC0>Vj`JZbJ%>{ zJOeIjz*(tG~{YBjo)%`G94F9 zSZJ@ZaX)HcKJ3#Kt3y|ZzCv90*lV1W{YN~|U7E4c)Msfbr<{lK(pkVw!>4K+W6 z&&?DD%!?Fp)s`>rjZ6WbO`jLGhj7r!V#PLaHX>+!6l0c+7m*UxPRMCtX)szQb{#)s z{a9S>vupU2w!=(Tc@%%r{W#F$^XO0jY4r#yn+md}w?xaw6=b3JA7rizKrODZF5pqz z=jXNsfMP<>B|`yjB}!C2rT}_U0=}v&E~kC=PG;e)hM?`8zWG-VE3C0aZp zrxiXs5bS7Kf)a;2OblfOZ*2@h3t2%kWwf)E$b=ONjmsLxv0FaEDO<43@}|2V;hC-R z%zs;n_IQf6FDLl)hJe<{32Kd~P$Dn*)^**`g}kh(E5DcW@|wU=bOfE*uN-%r;$MYk B#?}A; delta 663 zcmYL`&ubGw9K|!=+3Y6K)@0LccGC@{7xAD)D+D7p)WOS&x>0%(3YwG^i@yrRLqS9+ z)`MW;6Au~?m5L}9id4aavwsXH9&zG>pXsU;h#6rMN?tAyl%3mjj6t#IE6YvJX$T zdh9a3WUMHYeOB-<(}yEn9)EM8Ls{t(T>l>GJ>3pXl># zr95t*>k!Ji;KlV&-`5?|2LpndmW1Wt9+Mf5ElEnAJ(PrLe&cK>{nQY=wHE4V)*-JX z(^X#dI$Kt@ugz!R6S3gk zjTu$nkri4&o#L(Az!Wh0P~+Gok_U^N;EF$lUqESGcV?xRqOwKPWl~zaC|f`cXEAh# zaalF-QMO4E-;@weDHQg@cu!5-P;A($EvwfN^t;wzH;#vX6Z0+xdIsmb=6OUtCD5nx zsfo{S8&*4ovEX4aG%1Wb&%be0VZ&pGFk)T?#q{}{_nN@LUw=}wVYFRLpEL&6M5&Jh zJ_g^Gpl3YpjSCv6;tOJeF7jA8CTOvWk$0@~PlLk$mg=g?KYg>AYgxD%5lTZfgU=>W kT<0-8Ea(f5r%`MTWTBW8Ly-Nl`UvqTSc0QFVu#1KlW+i zbwy<}0k7}IZ(BeQT>b>KY@Ej=vVt9%Uk7NKPvw?h`5`Z(M-;aJc*j%WuI z>NSyC`096{a#R`<0S>8+(zp!>WBSk7NpWCfL>kc`hpmR=vEVg@mA|w{cYqAb^hM|J zQRnt!YZ`~cK}ioq*;ym0k1xia^;WQFU4Ff0juRwDazom n*DD*BL>VcQ^i7mq-B@lUV9S=|#NhDOA-!-Whoh*Zvzf79L9&eA diff --git a/src/aodv/test/aodv-regression.cc b/src/aodv/test/aodv-regression.cc index a7706e9ce..e61e37784 100644 --- a/src/aodv/test/aodv-regression.cc +++ b/src/aodv/test/aodv-regression.cc @@ -133,24 +133,35 @@ void ChainRegressionTest::CreateDevices () { // 1. Setup WiFi + int64_t streamsUsed = 0; NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default (); wifiMac.SetType ("ns3::AdhocWifiMac"); YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); - wifiPhy.SetChannel (wifiChannel.Create ()); + Ptr chan = wifiChannel.Create (); + wifiPhy.SetChannel (chan); // This test suite output was originally based on YansErrorRateModel wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); WifiHelper wifi = WifiHelper::Default (); wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200")); NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes); + // Assign fixed stream numbers to wifi and channel random variables + streamsUsed += wifi.AssignStreams (devices, streamsUsed); + // Assign 6 streams per device + NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch"); + streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed); + // Assign 0 streams per channel for this configuration + NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch"); + // 2. Setup TCP/IP & AODV AodvHelper aodv; // Use default parameters here InternetStackHelper internetStack; internetStack.SetRoutingHelper (aodv); internetStack.Install (*m_nodes); - int64_t streamsUsed = aodv.AssignStreams (*m_nodes, 0); - NS_TEST_EXPECT_MSG_EQ (streamsUsed, m_size, "Should have assigned streams"); + streamsUsed += aodv.AssignStreams (*m_nodes, 0); + // AODV uses m_size more streams + NS_TEST_EXPECT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + m_size), "Stream assignment mismatch"); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); diff --git a/src/aodv/test/bug-606-test-0-0.pcap b/src/aodv/test/bug-606-test-0-0.pcap index 40699eb291345d8bf4988b022dcbe2f97c86447c..6fb776c276c330bdb39146bb2a074be708cdaaa3 100644 GIT binary patch delta 473 zcmXw!KS&#K6vy+vx!mRM@=p^X$|b$f3`HSYC=?t|P!P;jx`~sNtCNFBC?c&@XbOUO z_X;f{WDp!o45Bnplu|ktbt_aiojRn_(V((a7cK_Izm-v}vU@hWFCNEKm_P9x!wkk1ehmYk6i@2qT1w$#lu%H) zjWRvv%W#J6u!=V-4<$@q3_DoR#Cloxq%v|b5iuF(Iq4l*3DNyZ@|j}tlZb=gNpXF7 zfb+5srtn3?!t&8!UTzXS;8UfFLCLpdWeSBt#YY|6hp2^>FMelk-$V&NNyPVQ4*lS_ zT8^f=qS#@0AGc6x1q_Gn_&U*uk6Ylaq=V=8$YI~!e%P^FDGUEU2X@{`dH8l9 u%Be07iG9BAIzX{0l<(ahUAVadSJI=XH27cPz204~y(&7ia;nxjzL635b+~^R)`;WuTj!L zVj&_VVi1E#1b+Y7b3Nu-NUB9q6x^24W3%J9Ow?|CVExKA;=b_1_UVxViZb) z6hq_lBB&KlMZAzmFM9sH49`eAU@G>VD}KjPAF z0~S|*6vbR*hVI9N&`pyIg_vt}&lL9qaXixliT=hwN12gL2s^+QT zJSWExkJ|XF=9d<<7Go2b*K2fH<~$oG4VfMfaqb`{j8mk)=G>CXIB)#e4o}63;bAiR zp4BlDtFfoJt0(ax)XVi%~{&ne{{jGuPt;XWbq SAic|MrCl}(mKen8KJOm`KezAz delta 676 zcmX|8O=uHA7|ne9Gsz~~P1B^=mBg$+2lcQOB%W-H3l)E2;-wd%mmKy`w9rfOAhtp= zAV`xwuce|QRSF)ef(Su8R_wu}coOv>w*F9~h!AHdsdJd0H}AdSy_ql07n?bH9ck?j z=&P8W*77-)YHilo1B|j7jVm~>d{9-xH+il9KPn!PXkHeIvz(; zyH2MQ(qNw{3_{K&I%3NEu8G@*i@$n6+XIqQE}(6@xWj#Ar5b^iC}1*L;t?@^-wMw* zx_oSHCE8(Z9m__8+Nu!RD92Uy0n^SN1aV(^Qwg~foC)2Z#T^~Tdc1^-iI>d5h}mEV zam`5Ml^LUZB$ISZkM1in$?<_AJykH5%uz)ZDO@}r26kZI7}UI{NUDy?Rv_*2GLnx`UI7@pvY z5YF_4UCwc4xTLEBJDQQyRMw~dc1CQ)KZn2iHtW&1v?Ls|B|2qSNgonOeTU;a9=)?9 SXVLku>h&O8)?8&Al`L diff --git a/src/aodv/test/bug-606-test-2-0.pcap b/src/aodv/test/bug-606-test-2-0.pcap index 964f590096cd40c66e753eaaae06d327217a971e..4b69524077b8bad29f0aa30ade2cbc124115fa0a 100644 GIT binary patch delta 527 zcmX|-O(;ZB6vy8^_s%@;%M4L7HIpZrCLgzm6w>sREM%xziF~A|EQBO039+y-b2hSJ zNnxWjODv}-8&Oh9lVoEfWx;*#;%@H0bN=U?-#NR9-Nbf`+-Kuc@I`RIjAr**Ax*K< zu(KZ=Mk!wF5la#8m?}y}{282MQJf?W%riVvBX~|2Yz0KEjYYy?D2QXhNRBeCUHz-L zQKOgvN2}HpB_(>K(2L}O!-D?nhJM3uk)T|gHU4bgs71;lZvKxNv~W3S<1=;1IKHzA z9Az3@SUAl#;H>oDb{E2MU;|d_b733v0f+9i5X_cUoyLMk1ge^TatqU;Jz7yVd_I2Xk1$s`%88Y>Qm!TFZWOB4AufZl&iZ0@k)=wlXnntOchOo zlW*)W(hyR`F=J!|4~WA{KA8J*N A9smFU delta 524 zcmX|-O-LJ25Xbk;yxrvOM;n8I1U9%H43yG^LK~2Vnr`s}l}03<{XkZzQfMhP7cG=x zu1)45UTUF-mgXi%jvhr&^wLX<7ez$xB6{)dKJ{JRpPB#6{ASh)YlUwv``pOS!4F1b zcCPXLIpmN^me;uO;StiFnRPVz7E#lx@~_f+o}*b7K#5Z;k)Hn)FhPXSXDP5C#vrp;& G>6bSWK8y?i diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc index 43f04302a..966fed243 100644 --- a/src/aodv/test/bug-772.cc +++ b/src/aodv/test/bug-772.cc @@ -108,6 +108,7 @@ Bug772ChainTest::CreateNodes () void Bug772ChainTest::CreateDevices () { + int64_t streamsUsed = 0; // 1. Setup WiFi NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default (); wifiMac.SetType ("ns3::AdhocWifiMac"); @@ -115,18 +116,28 @@ Bug772ChainTest::CreateDevices () // This test suite output was originally based on YansErrorRateModel wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); - wifiPhy.SetChannel (wifiChannel.Create ()); + Ptr chan = wifiChannel.Create (); + wifiPhy.SetChannel (chan); WifiHelper wifi = WifiHelper::Default (); wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200")); NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes); + // Assign fixed stream numbers to wifi and channel random variables + streamsUsed += wifi.AssignStreams (devices, streamsUsed); + // Assign 6 streams per device + NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch"); + streamsUsed += wifiChannel.AssignStreams (chan, streamsUsed); + // Assign 0 streams per channel for this configuration + NS_TEST_ASSERT_MSG_EQ (streamsUsed, (devices.GetN () * 6), "Stream assignment mismatch"); + // 2. Setup TCP/IP & AODV AodvHelper aodv; // Use default parameters here InternetStackHelper internetStack; internetStack.SetRoutingHelper (aodv); internetStack.Install (*m_nodes); - int64_t streamsUsed = aodv.AssignStreams (*m_nodes, 0); - NS_TEST_EXPECT_MSG_EQ (streamsUsed, m_size, "Should have assigned streams"); + streamsUsed += aodv.AssignStreams (*m_nodes, streamsUsed); + // Expect to use m_size more streams for AODV + NS_TEST_ASSERT_MSG_EQ (streamsUsed, ((devices.GetN () * 6) + m_size), "Stream assignment mismatch"); Ipv4AddressHelper address; address.SetBase ("10.1.1.0", "255.255.255.0"); Ipv4InterfaceContainer interfaces = address.Assign (devices); diff --git a/src/aodv/test/tcp-chain-test-0-0.pcap b/src/aodv/test/tcp-chain-test-0-0.pcap index 13c1c4ad384e3f2a864e52e80f7b1a0f5c100ffe..e72845a4ea8b7a64c528a707a50fbcd56aec88f1 100644 GIT binary patch literal 58712 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 E0LI-negFUf delta 1459 zcmY*ZYfKbZ6rQ&$o6=Q+ zvD&mN98FAZRMub$p=@#bqn*?i1f#)3)@TVV)<=U$O{}HS+SWeoxpxCweoXFn&OMLs zd}n5+#^Dn`JCMS*4RkqbnY0r(_|&05ybNnnC5&r#;-u_`GY$#2wkP2inF_0LVyH>Q zBIbrxr-Ty}a*%MkO5x^Y6SyR)LZSyJ5}!f_xfU~7l1$IzF1%q#VJ$A))u3W0xYHsat;SZy*uhq`n^Rc06}|Ccmft2U>wD-ntJG!fWuZ5e@gVgIJv2n=1nphpy!B!u4YyH!BNIw%P|F)=Q*{j zj&cUG0fh?<#uEw_#5?iFbRE7rso*bbBRKW5$bEgEg8oV;Ud_s-Xn1?hh}mYR_Uba4(2v0t zGf;NVDEfw0=$!`A7|pt@fCConeqLXEe6T1K$$nYG*m3 z_vZ=orEbp2g(B)SS(<;a5VE zSiu3dXaz}P1s#pFg3?P=fmHW46Xndw{~7($687v%hCk`#bGUcvuz4opo4zLMYWfb! z>YSCt7@xkYvj=bS--R5)H+==*9hUh=gO`2jc&EPmRP13H)eZ&Dj>@8P_Bole!)5Iz nZ0<;26f+!-;ghjB88_@rTXa=?Ek>jVZ^rO+7Gii~-$KZLofYf* diff --git a/src/aodv/test/tcp-chain-test-9-0.pcap b/src/aodv/test/tcp-chain-test-9-0.pcap index 00b1263a7f57a2e88481d52b1ef8578c23407210..5d68ac7ba0348bd97073bbc4061ac3e3ec950513 100644 GIT binary patch literal 29996 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 delta 320 zcmX>zmFdh>rU^1k1yd&X`6x_WWXHw;1P^9Rl#63y1hR@Ify5_gF*-4|Or0pFFqw_f zY4RGz3rx3DC)Y9gF-fLRKF1`(ygHp}^7$b7$vn(@jAtiXGy5}FW-v{@Xe7<#o;i6H zb0l{I$XJkp;hB^9SY((FWP&tEOm<~4Wjs8&n#G^#au!&^H5;f;SAH`W>pd1`qav^& z%%a5*<2AVSn4T1aZTwmVl+uvjJdLZwoGGmzSYZ1J~vSPO_|wT$?mcu}q#&#xnVX&pyWco7emPXJI}g h$~?KyU7B&(JWh5CytMV^A0rH1t1I5WTN;;BcOY1JCa{?ubE0w4)R}cP#_O#E5&A_50K;zqr<> zUnsSG`v1b7$kEudYdP?X94xWoH0^a>j}Bv22V$R?-Ea_~c|pPv)#LprHI@Hb$q( zYZwEV?gmUwV3A>(6FB)FqaWkG$-YefOxZz`=P}7JSq4vzVOE&@i-~`7H?tOZ1IR>> zS@%LF-(pgjT*J&inUmR=`CSOp0>NZHfRJ7`+ZeG3#yxN{YyD-otW_ zh1nLwk(A!NgHuO}N#Z=%MJh8Gxi&Y5oMM?QV8Al@l%^c>nPP|oRh*c;e3&O6WR{=I zrKQKbESPz6p{X>pMF{ic^^Ee9D}Z8AK(;@V{NxirHhU=Z