gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[search] Do comparison instead of assert (for safety in floating point calculations).

Browse source
This commit is contained in:
vng 2012-02-16 15:16:45 +03:00 • committed by Alex Zolotarev
parent 53bcf037e7
commit fe18fbfd85
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
indexer/search_index_builder.cpp
View file

@ -115,8 +115,12 @@ class FeatureInserter
IterT b = e-1;
double const f = (l - b->m_len) / (e->m_len - b->m_len);
ASSERT ( 0.0 <= f && f <= 1.0, (f) );
return (b->m_p * (1-f) + e->m_p * f);
// For safety reasons (floating point calculations) do comparison instead of ASSERT.
if (0.0 <= f && f <= 1.0)
return (b->m_p * (1-f) + e->m_p * f);
else
return ((b->m_p + e->m_p) / 2.0);
}
};