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

[benchmark_tool] Rewrote and fixed benchmark rects logic

Browse source 
Now it correctly works with countries and World
This commit is contained in:
Alex Zolotarev 2011-08-27 23:04:30 +03:00 • committed by Alex Zolotarev
parent e175caa98a
commit eb15ccc1e3
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
indexer/data_factory.cpp
View file

@ -56,3 +56,10 @@ m2::RectD GetMapBounds(FilesContainerR const & cont)
LoadHeader(cont, header);
return header.GetBounds();
}
pair<int, int> GetMapScaleRange(FilesContainerR const & cont)
{
feature::DataHeader header;
LoadHeader(cont, header);
return header.GetScaleRange();
}

1
indexer/data_factory.hpp
View file

@ -20,3 +20,4 @@ public:
};
m2::RectD GetMapBounds(FilesContainerR const & cont);
pair<int, int> GetMapScaleRange(FilesContainerR const & cont);

37
map/benchmark_tool/features_loading.cpp
View file

@ -35,7 +35,7 @@ namespace
m_count = 0;
}
bool IsEmpty() const { return m_count > 0; }
bool IsEmpty() const { return m_count == 0; }
double GetReadingTime() const { return m_reading; }
@ -52,32 +52,33 @@ namespace
}
};
double RunBenchmark(model::FeaturesFetcher const & src, m2::RectD const & rect)
double RunBenchmark(model::FeaturesFetcher const & src, m2::RectD const & rect,
pair<int, int> const & scaleRange)
{
vector<m2::RectD> rects;
vector<m2::RectD> rects, newRects;
rects.push_back(rect);
Accumulator acc;
while (!rects.empty())
for (int scale = scaleRange.first; scale < scaleRange.second; ++scale)
{
m2::RectD r = rects.back();
rects.pop_back();
int const scale = scales::GetScaleLevel(r);
acc.Reset(scale);
src.ForEachFeature_TileDrawing(r, acc, scale);
if (!acc.IsEmpty() && (scale < scales::GetUpperScale()))
for (size_t i = 0; i < rects.size(); ++i)
{
m2::RectD const r = rects[i];
acc.Reset(scale);
src.ForEachFeature_TileDrawing(r, acc, scale);
m2::RectD r1, r2;
r.DivideByGreaterSize(r1, r2);
rects.push_back(r1);
rects.push_back(r2);
newRects.push_back(r1);
newRects.push_back(r2);
}
rects.swap(newRects);
newRects.clear();
}
return acc.GetReadingTime();
}
}
@ -89,17 +90,17 @@ void RunFeaturesLoadingBenchmark(string const & file, size_t count)
src.AddMap(file);
m2::RectD const rect = GetMapBounds(FilesContainerR(GetPlatform().GetReader(file)));
pair<int, int> const scaleRange = GetMapScaleRange(FilesContainerR(GetPlatform().GetReader(file)));
my::Timer timer;
double all = 0.0;
double reading = 0.0;
size_t const count = 2;
for (size_t i = 0; i < count; ++i)
{
timer.Reset();
reading += RunBenchmark(src, rect);
reading += RunBenchmark(src, rect, scaleRange);
all += timer.ElapsedSeconds();
}