From 4f0b9118c362f99ff97938310e59ea59d70a3a07 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Fri, 13 Nov 2020 00:31:56 +0100
Subject: [PATCH] Added test for the collect modes, bugfixed the new modes.

---
 src/db/db/dbCommonReader.cc                   |  53 +++++-----
 .../streamers/gds2/unit_tests/dbGDS2Reader.cc |  97 ++++++++++++++++++
 testdata/gds/collect_add_au.gds               | Bin 0 -> 12990 bytes
 testdata/gds/collect_added.gds                | Bin 0 -> 4990 bytes
 testdata/gds/collect_basic.gds                | Bin 0 -> 9360 bytes
 testdata/gds/collect_overwrite_au.gds         | Bin 0 -> 8008 bytes
 testdata/gds/collect_rename_au.gds            | Bin 0 -> 13248 bytes
 testdata/gds/collect_skip_au.gds              | Bin 0 -> 9598 bytes
 8 files changed, 126 insertions(+), 24 deletions(-)
 create mode 100644 testdata/gds/collect_add_au.gds
 create mode 100644 testdata/gds/collect_added.gds
 create mode 100644 testdata/gds/collect_basic.gds
 create mode 100644 testdata/gds/collect_overwrite_au.gds
 create mode 100644 testdata/gds/collect_rename_au.gds
 create mode 100644 testdata/gds/collect_skip_au.gds

diff --git a/src/db/db/dbCommonReader.cc b/src/db/db/dbCommonReader.cc
index 8728f986d..741cf1f0d 100644
--- a/src/db/db/dbCommonReader.cc
+++ b/src/db/db/dbCommonReader.cc
@@ -305,55 +305,60 @@ CommonReader::finish (db::Layout &layout)
       new_cells.insert (std::make_pair (i->second.second, i->first));
     }
 
-    //  NOTE: by iterating bottom up we don't need to update the layout (we need the parents for merge_cell)
+    std::vector<std::pair<db::cell_index_type, db::cell_index_type> > cells_with_conflict;
+
+    //  First treat all the cells without conflict
     for (db::Layout::bottom_up_iterator bu = layout.begin_bottom_up (); bu != layout.end_bottom_up (); ++bu) {
 
       db::cell_index_type ci_new = *bu;
+      std::map<db::cell_index_type, std::string>::const_iterator i = new_cells.find (ci_new);
 
-      if (new_cells.find (ci_new) == new_cells.end ()) {
+      if (i == new_cells.end ()) {
         //  not a new cell
         continue;
-      } else if (! layout.is_valid_cell_index (ci_new)) {
-        //  this can happen if the new cell has been deleted by "prune_subcells"
-        continue;
       }
 
-      std::map<db::cell_index_type, std::string>::const_iterator i = new_cells.find (ci_new);
-
       std::pair<bool, db::cell_index_type> c2n = layout.cell_by_name (i->second.c_str ());
       db::cell_index_type ci_org = c2n.second;
 
-      if (c2n.first) {
+      //  NOTE: proxy cells are never resolved. "RenameCell" is a plain and simple case.
+      if (c2n.first && m_cc_resolution != RenameCell && ! layout.cell (ci_org).is_proxy ()) {
+        cells_with_conflict.push_back (std::make_pair (ci_new, ci_org));
+      } else {
+        layout.rename_cell (ci_new, layout.uniquify_cell_name (i->second.c_str ()).c_str ());
+      }
 
-        if (m_cc_resolution == RenameCell || layout.cell (ci_org).is_proxy ()) {
+    }
 
-          //  NOTE: we never reopen proxies (they are always local to their layout). Instead we
-          //  always rename for proxies
-          layout.rename_cell (ci_new, layout.uniquify_cell_name (i->second.c_str ()).c_str ());
+    //  Then treat all the cells with conflict
+    for (std::vector<std::pair<db::cell_index_type, db::cell_index_type> >::const_iterator cc = cells_with_conflict.begin (); cc != cells_with_conflict.end (); ++cc) {
 
-        } else {
+      db::cell_index_type ci_new = cc->first;
+      db::cell_index_type ci_org = cc->second;
 
-          //  we have a cell conflict
+      //  we have a cell conflict
 
-          if (m_cc_resolution == OverwriteCell && ! layout.cell (ci_new).is_ghost_cell ()) {
+      layout.force_update ();
 
-            layout.prune_subcells (ci_org);
-            layout.cell (ci_org).clear_shapes ();
+      if (m_cc_resolution == OverwriteCell && ! layout.cell (ci_new).is_ghost_cell ()) {
 
-          } else if (m_cc_resolution == SkipNewCell && ! layout.cell (ci_org).is_ghost_cell ()) {
+        layout.prune_subcells (ci_org);
+        layout.cell (ci_org).clear_shapes ();
 
-            layout.prune_subcells (ci_new);
-            layout.cell (ci_new).clear_shapes ();
+        merge_cell (layout, ci_org, ci_new);
 
-          }
+      } else if (m_cc_resolution == SkipNewCell && ! layout.cell (ci_org).is_ghost_cell ()) {
 
-          merge_cell (layout, ci_org, ci_new);
+        layout.prune_subcells (ci_new);
+        layout.cell (ci_new).clear_shapes ();
 
-        }
+        //  we need the instances of the cell we just cleaned
+        layout.force_update ();
+        merge_cell (layout, ci_org, ci_new);
 
       } else {
 
-        layout.rename_cell (ci_new, layout.uniquify_cell_name (i->second.c_str ()).c_str ());
+        merge_cell (layout, ci_org, ci_new);
 
       }
 
diff --git a/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc b/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc
index 58b4cb80f..838260bf3 100644
--- a/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc
+++ b/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc
@@ -436,3 +436,100 @@ TEST(3_AdvancedMapping)
   std::string fn_au (tl::testsrc () + "/testdata/gds/alm_au.gds");
   db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1);
 }
+
+TEST(4_CollectModeRename)
+{
+  db::Manager m (false);
+  db::Layout layout (&m);
+
+  db::LoadLayoutOptions options;
+  options.get_options<db::CommonReaderOptions> ().cell_conflict_resolution = db::CommonReader::RenameCell;
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  std::string fn_au (tl::testsrc () + "/testdata/gds/collect_rename_au.gds");
+  db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1);
+}
+
+TEST(4_CollectModeOverwrite)
+{
+  db::Manager m (false);
+  db::Layout layout (&m);
+
+  db::LoadLayoutOptions options;
+  options.get_options<db::CommonReaderOptions> ().cell_conflict_resolution = db::CommonReader::OverwriteCell;
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  std::string fn_au (tl::testsrc () + "/testdata/gds/collect_overwrite_au.gds");
+  db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1);
+}
+
+TEST(4_CollectModeSkip)
+{
+  db::Manager m (false);
+  db::Layout layout (&m);
+
+  db::LoadLayoutOptions options;
+  options.get_options<db::CommonReaderOptions> ().cell_conflict_resolution = db::CommonReader::SkipNewCell;
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  std::string fn_au (tl::testsrc () + "/testdata/gds/collect_skip_au.gds");
+  db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1);
+}
+
+TEST(4_CollectModeAdd)
+{
+  db::Manager m (false);
+  db::Layout layout (&m);
+
+  db::LoadLayoutOptions options;
+  options.get_options<db::CommonReaderOptions> ().cell_conflict_resolution = db::CommonReader::AddToCell;
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  {
+    tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds");
+    db::Reader reader (file);
+    reader.read (layout, options);
+  }
+
+  std::string fn_au (tl::testsrc () + "/testdata/gds/collect_add_au.gds");
+  db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1);
+}
+
diff --git a/testdata/gds/collect_add_au.gds b/testdata/gds/collect_add_au.gds
new file mode 100644
index 0000000000000000000000000000000000000000..ca0206610f735d387d7be8c495ec574f7d97e7bd
GIT binary patch
literal 12990
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

literal 0
HcmV?d00001

diff --git a/testdata/gds/collect_added.gds b/testdata/gds/collect_added.gds
new file mode 100644
index 0000000000000000000000000000000000000000..e4882b6d8354f758abd8171d00e5d3c2dcc31d6d
GIT binary patch
literal 4990
zcmeHK&1(}u6o0!(rZG)REJdXT6dFv6#U^cyRfw3@2*uF!P-yE{h-qR2X_O}T0Uo`0
z^W;Sj9t8gZ5f7d`h<}I&PvXIoc<}e$>~1&dM>YjTBm>Kvo%iO=@4erf*;!I#nyVBw
z%)T$wPhmPrCY^BiDQK$P!W_}CFK{vQ^xV}?Z@!<u{C@J)i)+gi4eUMdh*GgwY(BrZ
zoLyZmEG%Bh<CXj&qR^1yvDhqyBR;a5I&IP*4Nj<~`D`wiW((r60T~;s+^sjq)1wI)
z3)3*{#>$mSVSNjuqlq(#v!dzW*3=$oO_D?t+SZgdv}RUo4!JbeoRroCwWij%S1eWQ
zcVw2<^l43Lr$$kPvE8l~8!r2Rwy)Ojm$w?_@pPqFYm^0-U&psu6!%FP^U*Q(Q7b+w
zBfRS(FHB7)Zi?2VC~G+*g?e!l-r|ksdV$~L8l9mrG|LZ>vv?*GmwCi1fy?w<u~97%
z`48i9@iEim1NHXj`B<@7>cmH?$457OBoDej);#ht-Q%MhJ`Q|dWjpW@w!R<91oasC
zD~#X+vhNops2S<8(G431KCkv=qmTBzm4%dj_won9>41s*o*Fc9347_fi^-kLJO%Nb
z$oxQL+_L0H$W@Ggw&Xf=Kk&{HHpVlT#JDk`?F?%k+p=GogK2EfP2^8>;D>C<3f<(U
zvKwB(0vnd>*ZhVDczy4*^p8M7=R2vT#KIV?n0#NcHgJo?xbKO!v*-D9c!yt>+}O^M
zz{!3XuSj$)Jc8FF6EoD##N!=I@G8iRtil-rE6&5&!oyMUm}JtD5~Uq2Bsa0+4$rfF
z@w;wbkSnD!nU<Sl>rLK^54#RiPV|OVhfRqd^(76`MlAJ+K|2eM<a*=`pvE|Q=0GHK
z?22CM4)w_XxGtsXb-F=3?I5;yPHi{7T2^L+%%3G09V2igqk&#fF(=$-zHEuE)x01D
zKP&Awdo^OfL-=?g6R|vnqk&6Sx8>aSvO?H8MfeNcUcLYPInrTYB71AC*-KHE*~34T
z8sa@-&5H)+-r8B`S{b?lDx%K+m$sFE;V#Y(;LNt-oVM5V%Cg3ZTJaE{8(I6j_W0Cm
z*`;18DX1&SsUrIn_z$WmquJT(w(2!I`6YZI+AFF%hWD<-;ID0_^ctus57ofcjBl#M
z&^~XsYQQ?)<HZT9ePSQVu83^N?s2UKjfcI}VW)HL<(H;pHTwqZF?Qf_q4Ab8_YMLw
Hzn^{saqOLM

literal 0
HcmV?d00001

diff --git a/testdata/gds/collect_basic.gds b/testdata/gds/collect_basic.gds
new file mode 100644
index 0000000000000000000000000000000000000000..9fad7517e9839b30d7a798f9db07b16b492bd6ee
GIT binary patch
literal 9360
zcmeHM&2Jk;6n}Q?jgvT$8&wqoACMZ6R;{R=4<|ti$|q7q)bx<HX@I6~;?PKLKy}22
z#DOak2Tokzz@ZYC9y#=o6GDhTf+K$b2Tq6s@Aqcj?(A-2k7@A9BW>P#X5P&2z2AFp
zcPA83HoHybOm^@O8lfUxq8eRr@2QXtHg2vET^z{2z5LbOyTAVU=fc{H8$W!vvqk0n
z*?O0PU}9oob@SHN`u5iD&0Ftm@=wYQ6Ah0C=$n|MVrhW11=q4PMq}55+pFsv8;h7h
z=o^*3D+eDP9ba9%T#>#aUF3OJ8V3iv`%k&|a^=m+tc;9ABh63ENR?z{I2ze|Y)0nI
z$dEH)b!uj$U`Cp)kL!DfM<0ro85uMqd+CvYO2GE$u-<a!=gs`XqfZ)7TaBxW2lZyF
zA-HnJz9)5AzAAkK^a|E!)<18sdGCpQt9qmIfsAIUj8S-G_o)7aSDS1d@9*OGq(PT4
z7>*mCvCk&&*<Qj<%;n-ry>+-pl)J!}!$+;p2glq0&&OR)K4$xT^n{N)o_x&o`REBB
z>z;f}_xb1vA8Vd`O!fKb2_LH+_$Zk7t3De&VPmBO8~V0e?eozSK9)WCSm^W76F%;D
z;G<~22CEh7Gtv`Ab~-Sk6>GlFM^E_JZpX(UwLN7S4)iP~SKx2|(JW;s7|ZgZ$`{Vr
zikz`zPgv{|sibfDw_bnqJztpzrZ4kNBr!kpm(hbnlX<v-9<M3u;J0aVvfzolMoHxR
zg8VmKjHSI-<SJ!%i$D;=0!E%f%=($@c0IFJHwb4_2%CZsc5AcuicDqbUmh2qLALX)
zj$>W3rVr8}2=2wta^@&_HN$HZU&}9-EXZOxzhrM?neDm5-S`f*^WWi4d<Q<!J69Vt
zS7y%OQ+>lS89{tTYI4U)aEOQsC87)5St<9(74+Gh;a_Mz-d3d3DWs=nH6lw8|I9Lh
z)I}wchg<-9Mg_E(pRsz9<!_iVL~fYn-6Nk$A%A{m&M0Ek8AcZR9>{<amm<bE5W-^U
zG0M<l?uWIVat_r5YladW@w(EW@5fQWRNj=GznoTglXd~8;uhQ39+9w<*^v2;ox+Uz
zL+3!pvgoob_dF&Nc7aJqTi+#at)BS7wV$VP^NCTeIqUI!o#{4T`Rq9uN9FR!bMcl%
zmeecfSAH_UO<fC~v3E~=tyqg&G3|rK?k0XRXt+B5Co3Yom$PCuZpD-j8rO;rPitm-
z#q6M`3m(?G>l-g|h4;`)a~<iugqO6cR#Q3qeJW>BOHf--lTd3QwYqZs2y+*81o@-+
ztJ3Bd=Bb|KFmf6?+$1Me>U)$*nIV6Ca#1Z?NLh9)mYH`RQ}Iw4xS@)QWXoUyEEI{V
zib|nX2o`Yl5Dzf&P{I;C0bwzodT3@JAH*C_%khZi|9o}#v^NpOQR$(Vj;Kg48Bv9Q
zi1NRO{~hBB#ku9N2OKc)x~s>P#Zxa>a`m{bdg={5^r~`2`;~xi?Bv__*U8uy7V(VK
zX9i1&05Fb7K!k7$C33@w4BSg(ASw_^kQ`z1T!!RJazG__+2$EJ_t^?&U%yiqe7(iH
zI2D`Y&w4o-0psrz70Zda^1o^~jyhCK&B^(c$4^oo=Sm|_X?Tk7#q)f7E;*_d$>yne
z9($Ztg}@FfkX9kf7WZiLWN61Q<eu$#Ml^5axd(@#8wK;qrtcSzsUI9mjO<G$Tv<`(
zJMfG5zs=kHh90gXE0i9KtDHD9J8&<5f5qQZ(s9Oq3s(u2+z50>w90rP<Tr7Ha4n4Y
z?mQIfCGiK(qDtw7g`d0zOO$)vVTr1CJH5dI(a=NJdy!t!hSBFlT=5;g{Hi^#pQ!ec
x-f4TppC}x=9{Dg<O2$&OM?3qW7mpr)J&i5Hlb;@Z!L4f_j=YHUIDT?D`WGF9ydnSq

literal 0
HcmV?d00001

diff --git a/testdata/gds/collect_overwrite_au.gds b/testdata/gds/collect_overwrite_au.gds
new file mode 100644
index 0000000000000000000000000000000000000000..e4790a23d63f1cd9f90e9ed6fc20f7d290376dcb
GIT binary patch
literal 8008
zcmeHM&u?2r5FS6<FK*&kX;glw%Ary%(u%6J)20NZAe<1Sim1sURa2k@lQ=Yz8&Dnb
zL*l@J3pY+&;J^WiOOFWk&=W$4KY}9%PKX01#DVXd-Fbd~j_qe7MId=4Yu?-0ot>F)
zX7=q`LJ5Lxnaczdzsi&p<taHWPsE?45QOVDRz%KZ^Dovud+ybrzWw9*mmgjE`peh0
zWG>%(-jiWiE|*s~Zf>n@Z|&T;`N{@fB{wNjoDJDmUMg3mIFl7?;j@91q;x6VTwPmV
zU*;HL-?a8!*nju%=;HGEiuM)d48~n(?C<aFJwWgI%H_(Ua;Dmx<_C^b73EB}IlK29
zXUTC+#W;S>b;l_<PP6r1efQw-9i8Pk6OOan%?V|Oy1ji+Z^g#v-S~sU_Ztsdjf>0s
z^=7M~dgYvb_v<RYs(o2`nlhU8j~X!Vb)_#XT&dhuZXk2y(jz;E_4|-E-#Xgc;rqPP
zF5`4KYJ3Qv&DU!4I#0L~&|F@rw+?nia;Nc&A##0;$Z&{MM@8h0$7v8E*T#qphsek|
za(e(GlfG&#j%yZba_X8ja)#U*fJe#WQLP|F#+VF)$;df^Z6wt`a&=s_PN-_F4M4=I
z*3vjbhRKkTtJd}aJPNLAjnOy}G*$+nVcD@T#^XfrSRH_eoeZnv9eud{W8`|(cSoO)
zz9;-**gnVS3ivXZ4kVDU6yQMrRqR}^=lkFpkS|1n$0C_GJ^cZ68~s0fx(D8$cqhe}
z%;zzR{>&veF5~BMEamDPOyhVqrGMc8a>OVZuIZ`wIDJ(Yj3K4m;CK9>Z}xjfb7w)p
z%bs&oZJ`d{rtEK68+t26fA&*1&gSLT@eaA9Y#bL+=t()$S1BI7KB{j@EO>%9EHWO8
zBgFzf)&@!)*%T8}t_xp9l$byd`kB6@9!hDa*=xQBCW;lPHn&b1ox?D!)jIAUk~czW
zq*xU4q->U36n@+lg$YX;k<kwptJU-l`ZbC?rDx)n(^B(d6k(LrZfSI%^cl1mX>OP`
zRddF#HUAu8<SmJ`2VXTJWghg>-1wC1WTw%y<TZ7tt)!p-^Vyy<dw6b1+UAfj6hM=)
zpjiq}8m0GHsUphEpw~UsXJk)A+p^OjVKK85X=*X^I2r908@jSZG%a8)CQW36T97vH
z<Mo-=(ju-wil#AWlyT;>OJk1j{Iy#e%TX`x^uMoEDY(xJXIWXovl%Q<oXf9#=NHo3
z=Giyc8Qp!lvC2{V{jKPLh$*;y=)&N~BnBEStf5vxSX*IxN3@tP897#Sxv!z0<FxX4
zs!_!;oC9B5R2kK%0#9kI4p?R5IGd+fK^McydnpYT7KIC49(dTZa+&4yM8YGg5v`#I
zJY|%c2N+rAF^yhE5Bl^+3y!mxI~`>4>!Qn2&QFIlqVAT9Iy)_N-T<cY7G&J+jNIhC
zZW<}J)A8%rs+8sa|GfgkLkJK47hzuRys?O7HfjJe`x7Lw<(g&lfSkn|HMd6ZyTdd%
zK+cMjbKGe@rYYj4tFE}}1Wu3Y6n>+%BBdUyoj&V4$EK9A=49B}D|vSpvj;KU!ya({
zy*;d{8=KcO3Sw1RGZi}e|El`d_QKz7?>SGyx+qSv=i*Yp>7z3wrSYHB8D9;4*NLrW
z^~G@zF{;NzLFCk1aXrB4p~v(?5!1s-0p2PF5_k%U`2?IkQu4pV$0E~IN@+%Y+bJdD
zgfGSC*vg#KwQ{6Wr_DBJ>QQ^00XgdYiCqQuT0|yq17i9bx<l^V8=F@RF;o-Pe&$|V
SN9Su-XVBaC3j+4!a`F#sYfwP|

literal 0
HcmV?d00001

diff --git a/testdata/gds/collect_rename_au.gds b/testdata/gds/collect_rename_au.gds
new file mode 100644
index 0000000000000000000000000000000000000000..af98c817f91686907748fdef6f8149bad60da3de
GIT binary patch
literal 13248
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
P#C;g$s1KoGxorLeOMoXj

literal 0
HcmV?d00001

diff --git a/testdata/gds/collect_skip_au.gds b/testdata/gds/collect_skip_au.gds
new file mode 100644
index 0000000000000000000000000000000000000000..5a0b96fa91c716bdae4f256b34354318f27c2091
GIT binary patch
literal 9598
zcmeHMzi%8x6rS5Vug^c_SP?>zg^*(5L`1~rB>sV9lsnr<5mubSNgP9P4*N_jIR@n{
zen=D)G)NRwG*D0=(WFEuMXCrP{s>A6DnvnrDEPiNGkY_)x4v;?P82)R-rL<b`{tYX
zz4vB!PQ@yUHq=BR>i<m*sS%~r3u@FoSLG;Py;f7|bg}QX>gRKB{QUi&3(Jo$e*5+2
zx|-<Ae(t$Ao}8RqTD!i!va!B(?fUC$xKyP<r3S}i-kZFlhR2E+QMdTzNR6t|3-OJm
zmDSZn_E5YxBKOYizISkVe(~(I+#6P>(eGSicXw;&A?}`?er5WKXogyv{SURKqC_*;
z(rn+?nt81ma5UzbS*<B+&3^O!`u5(zyYiIQ^lQy_S`(`=VtZ$=-gNr+>Hd2MA2c2|
z8|N2y>-)`y;410)J*bQMirg!z=V@cV{&54-dsF1Am5bANMH{IJYUz=!gZcwln`$2J
zZ1H+Zqbq0(hmDWmv#FcruHs1Ga<Nu#?rkeoI)%gGV>agl@%G>IaVwCIxtx!l@Nv5f
zA7x#yayELxMy(4QcJ-La`REBBOM!e`%K7LCAIpJ!T+aFE2_Gwgd{lBidcsFFkdK9&
zkDl;xrwbp$=4)_%GS3ix?*@N=%slJ&U==CCk-B{k&gU6&96p};`+OrXLn_lMXQU^L
zY#zl(zdCZ?YcRIETct8~V@4uXQ1K|UZC`e~cFcYkg*lI&=yNO8SGeW@ec^2*ztr~%
zknC6Zt0ko$^=#Uv?Ck_1omK5fcLeD#+MxWJbBoYQ^*6LUh?EF$-Vq_5FI*5yN@-ii
zK{%H}_=&S~C}u4pD-$2mj|Qdq64!#%NcQ)9iSE*mR?W=B7O!;+L0;BTkiz{_C)}RL
zHZTahiCx*mtHi@Tay->CdP(DCKf!Ng(udC=M#Sr6hu&vw@VrAz33Ge~{p@p;39~pg
zEoA;S3uaOtc$Aq1cIITnjdD9P&W2tv()9otvL54onJJm)ku_t+Bxh(P`!R;u=qa;9
z8kj|wQZwxsqx8MR9C%C+o0$tz!;>H(GCO137p~27L@plS3>eGgwAGHo(d86!U8!2u
zQWd8ixu9g^5G|#hg^@BdBBhThTP*}>9LG2Py=wozgFqX%d>j6Lcc6{iz72nmHpGU_
zj7rMu-=t~-BN^OEytKy+V#Bf^9yL)e3^0#F;s)l~k4>blcUEc@e?w*lmTKBNopwyc
z0{(4?$H}Gq^CS3;?L-rwDPX+eiN4woW_alve<ywj#IfYF<nI**+F15&`1@PVY!Fo$
zvw`MBX0zfW@ppC{B#6xnB+#4)lB$oy|6+5HAPzE+K$C%_{Et$7zb5}mAx^-eSYaF#
zUvxF#Ceg%KT@8GdXa?>D#jVZAg;Yi!N=72nq_G;CDl2OYZrZnvM6!}2dkRl=MoGm+
zhDipa?j@3|H|r!bl{J!0j}sD|!{!~6-^}*iEi!MJ|NAOZMg-uk*u!fofmAg5Hu^*R
zs`#Upr8AK5Euuj8ao^hD!{YDSmm=Zk;%B;_eXg{MYuKe^W4}a#FX7KhDBQ{vxc<*4
zOxXARC++oI-bPT*g>gz#dru^qY|S?jC2Io5FsrQ{OXLowh}kCZx4h=jY9UdGdVdEl
zb^by2_tczvfVz>9_2X|LVJF-SM&DHJ=)!@`2Yw;je6TEhkz#>)hQqFSlsw3SNaiqF
z5|eJM!JG7`<Sz3TUKBRzJ$PHZi1TDcHr|JZEzqmgs(3YPXDrYPrr~nq@8&q%fJ1Qe
zsqs2tT0XjX9sF<VF)Y&d9f}a7{8C!Gfp<{-27tLI_1k(Z(PYFBR}N&bGbeWy@K+9K
zGOX|o1D3)uqxKqPj_-WTHKXY-D>ZP>MF>p>j*&+#9NNBJ2VtRY9falxEB<PVco5Hy
zjsc^IMc+O(@l_Y49hn;6k5)rWovjT$ZfUwil8ym<D{4H;nf`<(W4>h1&NpZ@e6Q)z
g5dY$rvHLB&i6&#Tbk#y8BvyPMx*F?4AS{*CzppVI&Hw-a

literal 0
HcmV?d00001