Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-24 14:23:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified logic of interval calculation for exact size search

Browse Source
This commit is contained in:
csoler 2023-01-08 10:44:32 +01:00
parent fa071a1c50
commit 54cffac521
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroshare-gui/src/gui/advsearch/expressionwidget.cpp
View File

@ -187,21 +187,12 @@ RsRegularExpression::Expression* ExpressionWidget::getRsExpression()
if(cond == RsRegularExpression::Equals)
{
// Now compute a proper interval. For that we look for the largest non significant digit, and add/remove 50% of it.
int i=0;
while(!(s & (1<<i)) && i<32)
i++;
// Now compute a proper interval. There is no optimal solution, so we aim for the simplest: add/remove 20% of the initial value.
if(i==0)
if(MB)
expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::Equals, (int)s) ;
else
expr = new RsRegularExpression::SizeExpression(RsRegularExpression::Equals, (int)s) ;
if(MB)
expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::InRange, (int)(s*0.8) , (int)(s*1.2));
else
if(MB)
expr = new RsRegularExpression::SizeExpressionMB(RsRegularExpression::InRange, (int)s - (1<<(i-1)), (int)s + (1<<(i-1)));
else
expr = new RsRegularExpression::SizeExpression(RsRegularExpression::InRange, (int)s - (1<<(i-1)), (int)s + (1<<(i-1)));
expr = new RsRegularExpression::SizeExpression(RsRegularExpression::InRange, (int)(s*0.8) , (int)(s*1.2));
}
else
{