From 811560094a85db4666160a9a20046d3e52190423 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 4 Jan 2020 21:19:06 +0100 Subject: [PATCH] Updated tests. --- src/db/unit_tests/dbHierNetworkProcessorTests.cc | 6 ++++++ testdata/algo/comb.gds | Bin 0 -> 526 bytes testdata/algo/comb2.gds | Bin 0 -> 518 bytes testdata/algo/comb2_au1.gds | Bin 0 -> 1270 bytes testdata/algo/comb2_au2.gds | Bin 0 -> 1150 bytes testdata/algo/comb_au1.gds | Bin 0 -> 5560 bytes testdata/algo/comb_au2.gds | Bin 0 -> 4622 bytes 7 files changed, 6 insertions(+) create mode 100644 testdata/algo/comb.gds create mode 100644 testdata/algo/comb2.gds create mode 100644 testdata/algo/comb2_au1.gds create mode 100644 testdata/algo/comb2_au2.gds create mode 100644 testdata/algo/comb_au1.gds create mode 100644 testdata/algo/comb_au2.gds diff --git a/src/db/unit_tests/dbHierNetworkProcessorTests.cc b/src/db/unit_tests/dbHierNetworkProcessorTests.cc index 6f9743225..2f3fa3296 100644 --- a/src/db/unit_tests/dbHierNetworkProcessorTests.cc +++ b/src/db/unit_tests/dbHierNetworkProcessorTests.cc @@ -1281,3 +1281,9 @@ TEST(119_HierClustersCombArrays) run_hc_test (_this, "comb.gds", "comb_au1.gds"); run_hc_test_with_backannotation (_this, "comb.gds", "comb_au2.gds"); } + +TEST(120_HierClustersCombArrays) +{ + run_hc_test (_this, "comb2.gds", "comb2_au1.gds"); + run_hc_test_with_backannotation (_this, "comb2.gds", "comb2_au2.gds"); +} diff --git a/testdata/algo/comb.gds b/testdata/algo/comb.gds new file mode 100644 index 0000000000000000000000000000000000000000..b7c25e67a22b4dbf306bf9b098db65ae40e1a57b GIT binary patch literal 526 zcmZQzV_;&6V31*CVt>rQ!ywKe$Y9ODi_B)=U}DS3Ok!XVVP>^+>@@d2w)}&o%MSeo zv!g;7WLWX&V`Fo23}Rql;b353<7HxCWMJcCVqjp<5nu+A3=GWMjKH+eDxf0XH4HEs zCJv%m1cCb58Hlhan1O|xfq_E^VkesvV*>*Nj|{7`zyq))3>?Bt4B9|9$N+5z*~GcA z2u!m|u7dN4v5kw3EjYx}*&DaNAoc-Cpr05tSr9Z_0;rcbe}(u50M!Eh#U%u@749>q zEl~47K4WAM1^J9wW_is2A5WK{(0`LeAog*=!Y7!42dI{J`jh{k7kz`fg@uIy05i`= A1poj5 literal 0 HcmV?d00001 diff --git a/testdata/algo/comb2.gds b/testdata/algo/comb2.gds new file mode 100644 index 0000000000000000000000000000000000000000..8982b74f2da22b8905a4ce9326ae043c011d881d GIT binary patch literal 518 zcmZQzV_;&6V31*CVt>NG$iTuN%D~DXkIZHeU}AGNH1vx%^f55hb8%u2VP>^+>@@d2 zw)}&o%MSeov!g;7WLRd3Kz@Q_*3?vyCn70{0=qKwK z7cAp;9H&=w((eQZ*U4GauCGOW%555N{Ma0oLoZ~*O> z0op9IDu{vgOBRHdTm|P7Ym+ff|3K^ll0d&OXtE$^xCGEIMEHk;jV;7K0H_w~BV&Y* yoVGyC0{MuMfeGv*hVTZ6C^CKP0K_gXNT?Vx@CY#f|7aES|JRLGa96OfFaQAWa65?r literal 0 HcmV?d00001 diff --git a/testdata/algo/comb2_au1.gds b/testdata/algo/comb2_au1.gds new file mode 100644 index 0000000000000000000000000000000000000000..14e796643355e38a95c3c416fb5f4c56dc9edd01 GIT binary patch literal 1270 zcma)+O)ErU6vzK_U!J)!rZHI1ENn$&EW|>Yu@Pm`6it$q1^EDCVJDx##zLt{k|Zgz zVdD#6Wg&Tgsae@@o_p?b?_Axui|03Up6>6Q^W1YU6bxe$nV1p3MGO|2kU}>28;+qy zhjT!qX%7sp^^Tlxz4r|rc5SSeipbc}_bH|FSy&FB>I`zLqyeBKWzq_m2U+Ir4p6rZ zQz&twRS#Hk{F$XEGK-r+FO&gomd~FJ%J9!D-LPt@m$dFmwZv9{M8?jiZdm0s7;vb| z4E2{TkHfCaF`LUj|J_V{9_Cx%Jd$UduyZ?bStub{X@xD6I8n8`=h)$%tFGE}y@p-W zie2-2>=H_x80C5iyB4R}wOYe2p~Q(%uII38H_5K!BX$WTPK&{ z&KjP(ZX{CX*GK=<*XL!Kcf1LB2y}$bWj1N*xz|Ra-tqSRj_CafOjDJMO}uJ{I3{Hcqh7MQD>Y&q0V&@pW1W_=hy$~M|(P-P~zg#E!Z~x0Iq?Z!~g&Q literal 0 HcmV?d00001 diff --git a/testdata/algo/comb_au1.gds b/testdata/algo/comb_au1.gds new file mode 100644 index 0000000000000000000000000000000000000000..d12552b3a3ca4210134a58394d85994f311d6079 GIT binary patch literal 5560 zcma);o46%U-ks(45ByC1n*>X$Wzt->1{XRQ;c+M#VKl+`|=X~x_ zeAI*{lR01t6`9IOQ)BKo4fJhG{KqEBgnM_l8`F@@J-ws{+Kj0%VO_=;(^{XU?~TchwF&cQ=oi(F7!W%%SV!k8P3m*1!?3Hk zd*`0yC&^>@J9>(FBv_&S0-gOIPm1Idb(vs|F;QMWUHCvnpD{Is+|K&zs*BcVObdP5 z0)0;YOjV!t3Uf_o?9b(C`d)&(^Imcr_lqdEC1dJlHyBIo#IS|mXVhAL!`xoBt#fS$ zL$$qfPHiA|VzRB?wGE7^ZMa8mAa-K1ZLMp&d`NBI=hX&cCnnqK99x)a6kE9Vg4isv z6O(PVuI9Rzf&8CotSK^c5Odg zQ`^mV)COWFCflkUTjl!q#8&xWo7gO|6O(O`YkPL9+MfSOZ6J1HvaQm!_5G~2500x1 z#7<1Mg|6+3kJa{dyV^kP#AI8}wcXmKwuRej1F;j6ZGmHpn(v4$Y8w`tC3a%6E$iA| zJf*gm_o)rUPE59CT-)*eY8%R^4a81Nwz;=RbSYHZwR36%u@jSRbTh5GlcMD@u~pUf zhz-QfOtfW}9b47bLu%{Ds}00XOt$^w+For`+nX2E24W{B+m>A0ClhL;+lg-(zNLiN zi5}a3+{JW57N6^++lX$+>OAgcdq=j9$}{Qqq&u?0+{brhws88T<$E_yuHsTpgWky1 zxM{mg4gK2M6I07G!*}#+dgEmmS3X&`@b&?9F=sl}3Gy@a>*Y^Y-HO84eZ0!Y&*L^B zd)^P!%fx=;r0-3Y>lU24rIwOZEN!coI!o*=rPR8(kE_@xWFJ+DkBQy-JpWqA&O3FB zv!hy<>DIb3u@h74;y$k8b5h41t|}AziqBU!=hmGMq;B!@S*f$cexCjwlz$ode`n)9 zsiSj3_EDYqnAok)S9i~?J66=XkBruV*pC%c>*7ACqH{v_a21H%`h0bF-MUWw)4zDI zQ|mzNo%mDie|K@8RM9yhd$?tdtpl+)&8EJ)xKFC+oRB?S z2V%EAU)|qM-NIyt)GbU;OPwY5$&S>zxR0yYCuAShiI0ih`h0ctCRV+>g^>ZR`|263 z1F??`q}IiKQbp&4?BOa9yY>0%X56|XQ(E`#hgt_>KQfhC7xzgOofEQ$>p<+*=c~Kz z)@|Rcb$hRC9f*DV=G3~lPpasgkUd-nVz)kD-Cu59bX4maAJ;k%dvr9lF7A^mIwxcg z*MZor&sR6?)XiVHDs}Te_DP*3_A6IY>*7AHVxN$GR3|XHf!Cd-)bF* zeXu#TF7A^mIwxcgSAp2A&sTTLtt%bYy50?12VyTBPOXdkq>9c7*~4`pcI)%i{o&Sa zx~O$ey{>g2_DvU4>*7ACqH{v_a2<%<`h0c2J9Tq+8?-JM*Sa#X6I1KrKCa?(QpX;y zD--*Q&sX=GTQ^>ky18%arOp!jcqz3m?vpw?CuAShiI0ih`h0aa-Mao!tvk`Jbs+Zs z(bT%QPpasgkUd-lVz)kD-LGz4SDXSEK*-W8k37! hd(>zhh`mrut&97lip~ky!*w8b>swVv{{ssG^DiN};6MNX literal 0 HcmV?d00001 diff --git a/testdata/algo/comb_au2.gds b/testdata/algo/comb_au2.gds new file mode 100644 index 0000000000000000000000000000000000000000..ee738ddf465daa60c4be3b04f88aaee91a84f961 GIT binary patch literal 4622 zcma);Uucze7{{Nz=RNP? z!+S;vMbS>mS4GtmR7Y=6BY&;__rEEPlC7KCi5fH657zg+yJh_B)Y^`pR}2n(T%>%~ z@sgx{{dS@_B}(ces-k2;L`2IPGW?w=Guo!io#R9G!vta%#;>toO>U<)NeabH8@5y~ zX-2+rh2D;zGyH(vmnfxrM+J&sAxd+0cgdSoy+n2S?1qNBcDZz6M6GS4*Xmcl)uw(RcBboZUSs}8f0_?sXS#mxU*>;%+p#pSJw1e%dyqejs+H>+d>a{=V(zgV>p_e|(4e zgOT|lcBboJOU%E0!F&)q)Ai>^)vu}VRv%2uyU_D%*6cOEBWFH{o$2}qn#}*~viTr( zrt5z{ZazPE<@qVkUnO>?`Y-rg;ir9ZTPJ@q@YB9FhtHVsyl)@T3V#yt^S+8+m*;&Z zfA*94C-+YOhjZPH)~m&*MuF=1Z2hUp`A0()-%FYN7d!1*!bhEUO;8&4^GdIUUSEC} z>8Srr{G8bDov!H1_2*hk+L>G1p#4DXt)+^-bj4SS&wcfU*d1T`v(qEikGia1CU&OV zmvh<|Pr7Ad_k8VNinTv`{k--Av0sY)KA)4mdfX4h?)ch2R=X2T@Px>Hs$JhS4Ro35n*ZLs#b*ub7pVPj0(g(3SzV_3j)^A#A zeGq$k)bH~-?TaUU5WC|`|Jlu3+JAPZSNnn3Z{BkI;!9sW?gwIbeC-dkSpSD#tq)=! zXz}}ePW$3XAH?qX+Akfpe$OK7gV;-l{XU=5zIf6Hu{*x@mtV2|`-iL#Vqbp6@AEnB zizj^$yW>m$>ElN0$79wn6FbxG%Q@|fC;c+9d%pI^O4@&Vqe1(D*vCqKpU+8OJ?;l$ zcYN*ljadIwm-RvHeItIK&uL#g>4VrEU;BmF`d#O(4`MIGexJ{2Up(o9*d1T{`J(mT aA?t(K^F_bU=d>@L^g-