From c2d007abb99a0f09fcbcec8a0b0020458e3da931 Mon Sep 17 00:00:00 2001 From: ChunjiangZhu Date: Fri, 25 Oct 2019 06:14:31 -0400 Subject: [PATCH] fix bug --- .DS_Store | Bin 10244 -> 14340 bytes similarity_search/.DS_Store | Bin 10244 -> 10244 bytes similarity_search/include/.DS_Store | Bin 10244 -> 12292 bytes similarity_search/include/method/hnsw.h | 2 ++ similarity_search/src/.DS_Store | Bin 10244 -> 10244 bytes similarity_search/src/method/hnsw.cc | 2 +- 6 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.DS_Store b/.DS_Store index f522d6dcf805a403a1a0a6495bae0b3fe41941fc..92d8ceb4515dd42a1ef8579e5fc54e76fae76a1a 100644 GIT binary patch literal 14340 zcmeHNTX5Xe8UFu`lSqma%QRU>i;0)mCMGzm3`1AZg!P* zZ4Yf>T%8%6`_Yj;efrP;9SH!iFK=`LbO3-v2TRpjiXH?=va~F)c6MA6R!|Mn(MSj7 zRR9xma2C?wQEuT7qb_WG4IQ;`8uAt6b5LOA!br}sUFRh4Yk&(`@P=(SOXVm;2t)`( z2t)`(2t)`h9RarXQjpe&G>RhxA_O7?N(eCfkfej9sUV#dDK{MyF&Cb-GZ&r*%99S@ zb;%%21?j9v`A{0ehf*qrVjwY445#`e>rQDZNM}VVh69S>fWgcdC=}$g)3_w>4ww>Y z6h{a|2waK)dtGEW41>@M18{)SYheNmrm!=%o1s?f5qq1`whKJ)Q>-C{uT#HCut}q* z!Jv{4dgZ7UH!N;cX3Cok=6XFdXiT}y@pa2Fb9}I6nAGL?nB^GmRG*u743D2@L^Mc} zEXiqg3e4G{XT~QFtA2Y zC(5Px2b7x!q>2p8%c9<^mzeWo|9qPSY;SAko2(o&D%pxOTkrB{2bbe{`kCn4+06V8{(RzHcR9AjCDG1`Db~p z(iq<)tItZu4VvwMYp^pKqJLw2vn1WY>icsh#Ri|er8TaMdUUa>F3G&+>aB`0`Xw^; zsz+0?3%qu_5jdK?NH)l1%a4)b5OZ!w-O)Ex)T$0D_%XeQ#HTReesl} z{z|%w&3%jR`3EOWCz!skF&@92)%O~PX-JaPoN6PYQ)o_gh>T3$twt+r3iiWsGU$`^ zqC5l-!#CiE@N;+uo`o0Sm+&UM4e!9a@N4)Ddv0e6#X-Co58$nM5XbQZW-yBePGAAg;yIkg`|$z%Dt-+g!Jp!jcpjg^ zr|~&_L0nj@xPT3daxumiDYrO|25Wb0tQtoXgX@PrBaVJlD~S1p^&2)dZ@H#p=k+(1 z9&G3_RxqucUYu2eHk?jHx^N!P#TzziiOZEMitG-v{sm{sjKI-hK=#2WFnz5 z9!b0?whw$t8P5c&q2fvFy z#>WKZN<`dWq@YOg@x>7_v^K4yMckzI$tUMD!<|!FjVNEmkAf#?hVoUZ@&ck#gg}Hq zgupUIfbIR)RM+p^T`w1ytY7K-`$cuc4QP44RU`_Sgw0cIS4seEp!v%CYUB&$$W#|d zMz}P>BO}eqY+pgA5;NlLe}Z|n89op?V;%Rdd@}b;JTvoeaXHQ6lVN3tpDbSg5?5#yA*)MIIHXk;El(;$jnE07Mys^6 zGI>I3B@ifE6QpV`3Y6_iXSqPxp>&rEl-Nd*E$$e`AQLffw;*}Paz3c>Ok zyg{1zeJ)uR7A!@@JcRpkm{>WAM{taE^D(ZP87nQ4D<0-aKc6AF@)hFdgQT7XJDFg4 z6n`dISK?w=J3qBB7ejJo-oM`}SI?MEXD(ko=N>3z)Rtm-N@qn%IST*t9|1FTv622?^0&%J M{|6r|mx=!W7w;W?uK)l5 delta 964 zcmZ{jO-xi*6vxlsLAdWZz#Tq@JA`p24ii8D2biE0)B$2^BNY-sK~i*P-ZOn=K9m{i zM{6cA#`qO=@`6pYF=;nV!wRNdu+YS?aiyXx)Q!4uW7;m$_x#Vj z_vH6K_w3QL!-9y=KcjUJ`Qf6Se4_n4t@iAS!fUJl4OeVs_hV~KRkN}6Bp zF3Z127Rp!&Lw&*NUxN9ndY}+*8bSVAOQD=EuB{MX)~LJ3jCeY=&p4%Q7PY=W zBxIdSq|7;M>wSUdw$3fReJkY^m0Yb-Ys?{!=sIXDT@JjzBgvKTwE zQEgRtMj4qhQg)8mtadQ2DWi#KOivV(L|E-+e2;SA2YotYq*HeA3$=&2(5j5Z)5)Z) zG-HQzJ4A%>du-CWd@!2H4jt7~@_wuE{stk&t$3fN=^A4!5NZCvfkWc=&;|-qFAdW; zX>^<}(=1)5-)N2sv`9;IpB~U7dQ4B~CB3G<=^y%+R_QIhqxWENp$gU5<3lrAunDc` zz&7+?J9c0IgZKtR7{-1a!ePV^#}u-d!3mti8C=3;T)|b`!ta>J0t)yOw{gdeH2KVc z_^QGyZEXC+M(;-(pE@n@np^%G{)EpoifqQzFEdmf+P z>*W?Dd)XNDsvP_;rWDndpj6j<(AwIi=8&e@T4$H)n zANq@U_ZIPvV*=k|QbPU?-y?w}QaCOV|A@Mua2n@u9v6$WXYn&`;3j@4T&VvKE{EL) p{&jNRWxc@pm diff --git a/similarity_search/.DS_Store b/similarity_search/.DS_Store index 803ba2066393739bb1490f3cf8e05e7fa8fab7ab..5362351ee28bbffd01a6b9cca2d3dca62cad55f1 100644 GIT binary patch delta 1936 zcmeH{X>1f_7{{M~Y0J!X+D^MiXSdtk9`+P^gS1?|#I_VE&`L`yblV+aY`YEJZELAm zBt%6Z(M&)EA%YPk^&l2dqQ)3vLWn^EHK>VaG$elTiUtW^d}ek78e;UbaXw7)KF^%L z|L=WvwC-p<(vIW^Uo!^1Bw*8t3gR1=ZzF_hiUEBg>IDneK9{S=kSxZl)JYP@(q7oPBR>=!RB_t}bk?s}~r zbJ&mP@e+=@@iLBM3MX+2Z{ZBy#yj``7jOk%O&^Pw6BH@Ixy&v#cIbUW!8Q68jfoc< zH&X1j4a#lY%|v`THKo??kvJtg+`gOw3;s+Z2O_0Pb_TB+-KiCjjHgmdTcoxSKa{bG zGfGl&VquXawe{=40Hcglic2JC`+&b!8(`Ribx}p77gR}xY-^qr z6);g3Wm6?BqE_mp0FBXZ+DrTB2u;y6ouRXIfj**3%=Q!dn)!Z9-_Z|r4YAC4HUy*~ z177%0fVoV%6lJJp+O?=--Yr;dk-iTbun{^QWY%G9#Wp;O?bv0vz#haQ9J9zyGud~I zpKZ+y(#;_A|20VQCP?G7U1waGj%q%4InpPkVs~j&MQ0kjSs~4fs%S2y1yXfXMXS45 zS{hZ+m8Lpt>m*4b(?yY0EQm(+x5$pu8}vTo`i#D0NZ->hjH!>9Q4*VIGRj5{a#75j z%219wFUiynnhwJRY^%!U23|ZB z=X90F$***cey8h*!7RkF^vN8i3+eFiXembp$5?|VE4)>#dlwItUi2ZrLnVX}jB(djy?QygJPxHT#rZM5$`3K>E B)}82)>0-oQ)oCvbRwd+|BFya?4{u|ZcO|8~TOobRyYdRvE#str`9@XMsw!h;SXfuq*6}u8wk>ZP zn|MnpF;|69^h;T*BcxC!l~Mz>QZJ3rBps#`bei6wIeM2qp#}PuexzUN55(ba*x*7o z@=%0zs6{;*(S%KS0G-%|?dZZo*bN{0F@QmYFpLpQVhWGqF+^|(PvHoT;uxO8^EibU z@e*D|`s+B48N7ixyoV2P5tr~GF5`22HTzn8f~pDC*=)bR<<78+^+~&3^aKZnL)(M< z1Ns@e!zIK_ftPPY#AZy2ON6s~(AOUrG{G7pZ@F;pm zM!3ZI;vr3Z8df5cW%V$?LRPkdrLAO)2E0^LOW@@${;R6O^9X7)h)or#(~V91!{%2<_KSW;e9+ZZ(}LA9&SWf`3j zn@mY&l3LGre{k=3aBNcM@H=jvmZfDIupjhuv1}Rk2loU6esiN`X{!}wmoaY~4e+-$ zRy|sQk$@?-b&Ddk*r0BTZCzTXdW~2tv7^Zy{Cl)@YNZjzEwil?H>fp=(M>%A!$U)X z&{)_S*J}+%MfDmFZ})}AIz|E^e!lTHnzA%azmQcHF<*dxu9S~h`)jQI_gpKB^fUd! znSrY%0f|Ur>C<53mX9))-ita;X*1eb`K{QAU0g7|X1NTRIZbe_JkALn#9=dCsI$$Bme*a diff --git a/similarity_search/include/.DS_Store b/similarity_search/include/.DS_Store index 7b05ea0235ff90a3df528093b59dea57aadaabff..ae49c5aab33a814154aa1f10458db6674126b32f 100644 GIT binary patch delta 1550 zcmb`HTTEO<7{|XqyTF{oQik4^vp~Tv2wKpkv0w|WER+UpNl6Prv6k-cnU)jJUf6SX z!D_NzYU6{cscT}4*R;OXq(Ra|eKGN#XtYLR)I=ZD2j4UrP5PuWXG=qgeK2v7Z@&31 zXXZOIznRlxr;j%i5e9N*7g4($GAT;)0FhrOYOXrh+}7w*Nm8OxqtGrYn<8i{75358p{e5pG>6fTr%a%@Y+PoPUP&EE26f2*g7SgDYqaN zTs53_(ph)V%bejn=ZHf>CR%y1SEf5tmYh$eacCCwclJokNr;qbrA|)fEys%6VmuW~irTU(nzp<-SXXU?j0PDhc(JwL zFdk-8xwti#v)qT4`MR2Fy~(&mtmE{=uw}z3Ele)^6zI zjw(6EG|$t~sq5npS}Bt|vIbRo*LJ;NOxUrwu(_!*&)40f8T69RaD$0l&gN%Q|j;X~D#2oivMx@mG!Me>uO@?tq`J<*OOvYHaUm+r!w-H*n zKcb9+6h;Q!LH#sLMbAum}dk=M~Sk>ZO(7)6c z_}NzoOM5NXnQL4h`!}vbL;LjM|AlLXb>Tm8{cWHG^M;L^wuIX|xA*i#uOIoE16~cA z$5@FW53Ut<qtT@7L6QvNLV^SB_3lI=R3 zBPDyK#~Vwp1TD7sXhS&~mjZmWvSLR^b5~bSaV9uWe7nJ{Cn_%`w^vC$wEF#Cocq;R atZ5lhFS{a}6=z#sSh~9Lc-f7UB>n-u1cH?q1ohkb*Igp zLTMa=%n+pt+(6nDWYcCrj_=Hq`E@)e`}1&cFhLxlF*!kJ=4M9K2qq*0CU*)Y0|0ew BAS(a> diff --git a/similarity_search/include/method/hnsw.h b/similarity_search/include/method/hnsw.h index afca48a..165283d 100644 --- a/similarity_search/include/method/hnsw.h +++ b/similarity_search/include/method/hnsw.h @@ -478,6 +478,8 @@ namespace similarity { void SearchCosineNormalizedOld(KNNQuery *query); void SearchCosineNormalizedV1Merge(KNNQuery *query); + void baseSearchAlgorithmV1Merge(RangeQuery *query); + int getRandomLevel(double revSize) { // RandomReal is thread-safe diff --git a/similarity_search/src/.DS_Store b/similarity_search/src/.DS_Store index 45dfbda67602afd9cf4177fd1856eb87f964b55c..aa459d0c93099e61eaef33c4de7b8193b70c5d36 100644 GIT binary patch delta 1337 zcmeH`J4_T&6o$|5iEIg)uS4ScpawgM|&T(!xZDTc|`D3kw^KHg?|K#m1n$iOt-c|DU<%-v663**e+! z__^K9Vzqi(1MB8V0aJ{&4EoIhpVcmgEx864>`fDV#1i{NpVw~&#BQ%&SRCqfoLx`P z$Sx=@tEvgbCnR!P5@QEVL-_pW5mOAejhcr4*a5HAD}09OJK7O2EwiUjczoV|VOue$ zsv(|`7_T`rm%=lY&XFE-XvFl7MO5b2(o{a9bQ!W+)5L%g-qMJE;MO)M%Av4PJ1peW zh;+}~s4@smbp)bU<&8^X zc?Hutdk6aa`)BTy(Zgu+(4te&^aI6BZ{F8I#ImLN13>OJAq!T;VSjB~q%H zI+G~XNRgc>y%o~Y98MQ2(2G>bi?587dNC_iBpJRs>XxwzRkGu&LRzYPTd!i(ie$vs zMC}?@tA_t0PQiIs@?SXIp=o+18N8vlGWn16S!Vx3<{kqZ95VN{a3c*_GWk5@qX64v z`V}(&TA6-58qkWp*bfid(Y?e#z=r`0VHkd#!fBkr*(9996fWT^t|5r)xP^O9{CZRD P|Ka+Fhs&|ta1qf@nFdep delta 1364 zcmeH`y-yTD7>C~(ZVzOH>;(nwn2=9x}xd5e!&*STqDIVMZ4nEs^xFF2>tNEPdE8JH?nOpN!2UIdbyc zo|3Z4n!5SqlvK{rSw>e_H}(FY@Q>@7b^2Jq91w=48>f17O&FFwsEaX{mN3UUjKGkX z=P9YlnOUmZ9qQLdL%Ma2yA{Rm{-`D5#-cdBZ%Eh{g=K?-G)mujhzdT4+Q z8mFr?Mc3#KJ)jwSLeJ?Hy{5PHj^=2AKGA3TLSN}S{h*)p3j~JsNJJL$u?cPzpa^9s z$8J=h8VxvrCN!fJUFb#+dNF_?hA@IrOyCk6lemm4xQ%;wh-u8=5oYls3bj>Qc1gaR?b{}jnrdTR_*^(? z*j8dn#O?D?{Brwt+Ak|AxKGpcOveA7KG33!{+o>bH~qnCq#zS2Ho^%Pw!nj8Y=c*Z zUWqE~jR)Tt5B@NY!jDcF|4H;igMfPw!!msn7D70W3%DpfOkxVxaRX7@#4X%?YUQ*f R{y%5`&N)+;J!f+F{ROUNRcQbK diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc index 4813619..d56ff17 100644 --- a/similarity_search/src/method/hnsw.cc +++ b/similarity_search/src/method/hnsw.cc @@ -1311,7 +1311,7 @@ namespace similarity { visitedlistpool->releaseVisitedList(vl); } - template + template void Hnsw::baseSearchAlgorithmV1Merge(RangeQuery *query) {