Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/map
diff options
context:
space:
mode:
authorYuri Gorshenin <y@maps.me>2016-07-22 18:32:50 +0300
committerYuri Gorshenin <y@maps.me>2016-07-22 18:32:50 +0300
commit727fec59f186fdf0347098e36d5e862db0f72921 (patch)
tree9cbdeb822fdb4bfe2806f0f810564cf7c3b15e28 /map
parente69836616a71a12164b92fbaaccfb4c220a4bc5f (diff)
[all] Fixed warnings.
Diffstat (limited to 'map')
-rw-r--r--map/mwm_tests/mwm_foreach_test.cpp112
1 files changed, 56 insertions, 56 deletions
diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/map/mwm_tests/mwm_foreach_test.cpp
index 7e07fa6d5f..7e3f250a05 100644
--- a/map/mwm_tests/mwm_foreach_test.cpp
+++ b/map/mwm_tests/mwm_foreach_test.cpp
@@ -247,62 +247,62 @@ public:
}
};
-void RunTest(string const & countryFileName)
-{
- model::FeaturesFetcher src1;
- src1.InitClassificator();
-
- platform::LocalCountryFile localFile(platform::LocalCountryFile::MakeForTesting(countryFileName));
- // Clean indexes to prevent mwm and indexes versions mismatch error.
- platform::CountryIndexes::DeleteFromDisk(localFile);
- UNUSED_VALUE(src1.RegisterMap(localFile));
-
- vector<m2::RectD> rects;
- rects.push_back(src1.GetWorldRect());
-
- ModelReaderPtr reader = platform::GetCountryReader(localFile, MapOptions::Map);
-
- while (!rects.empty())
- {
- m2::RectD const r = rects.back();
- rects.pop_back();
-
- int const scale = scales::GetScaleLevel(r);
-
- feature_cont_t v1, v2;
- {
- AccumulatorBase acc(scale, v1);
- src1.ForEachFeature(r, acc, scale);
- sort(v1.begin(), v1.end(), FeatureIDCmp());
- }
- {
- AccumulatorEtalon acc(r, scale, v2);
- feature::ForEachFromDat(reader, acc);
- sort(v2.begin(), v2.end(), FeatureIDCmp());
- }
-
- size_t const emptyInd = size_t(-1);
- size_t errInd = emptyInd;
- if (!compare_sequence(v2, v1, FeatureIDCmp(), errInd))
- {
- if (errInd != emptyInd)
- {
- FindOffset doFind(scale, v2[errInd]);
- feature::ForEachFromDat(reader, doFind);
- }
-
- TEST(false, ("Failed for rect:", r, "; Scale level:", scale, "; Etalon size:", v2.size(), "; Index size:", v1.size()));
- }
-
- if (!v2.empty() && (scale < scales::GetUpperScale()))
- {
- m2::RectD r1, r2;
- r.DivideByGreaterSize(r1, r2);
- rects.push_back(r1);
- rects.push_back(r2);
- }
- }
-}
+// void RunTest(string const & countryFileName)
+// {
+// model::FeaturesFetcher src1;
+// src1.InitClassificator();
+
+// platform::LocalCountryFile localFile(platform::LocalCountryFile::MakeForTesting(countryFileName));
+// // Clean indexes to prevent mwm and indexes versions mismatch error.
+// platform::CountryIndexes::DeleteFromDisk(localFile);
+// UNUSED_VALUE(src1.RegisterMap(localFile));
+
+// vector<m2::RectD> rects;
+// rects.push_back(src1.GetWorldRect());
+
+// ModelReaderPtr reader = platform::GetCountryReader(localFile, MapOptions::Map);
+
+// while (!rects.empty())
+// {
+// m2::RectD const r = rects.back();
+// rects.pop_back();
+
+// int const scale = scales::GetScaleLevel(r);
+
+// feature_cont_t v1, v2;
+// {
+// AccumulatorBase acc(scale, v1);
+// src1.ForEachFeature(r, acc, scale);
+// sort(v1.begin(), v1.end(), FeatureIDCmp());
+// }
+// {
+// AccumulatorEtalon acc(r, scale, v2);
+// feature::ForEachFromDat(reader, acc);
+// sort(v2.begin(), v2.end(), FeatureIDCmp());
+// }
+
+// size_t const emptyInd = size_t(-1);
+// size_t errInd = emptyInd;
+// if (!compare_sequence(v2, v1, FeatureIDCmp(), errInd))
+// {
+// if (errInd != emptyInd)
+// {
+// FindOffset doFind(scale, v2[errInd]);
+// feature::ForEachFromDat(reader, doFind);
+// }
+
+// TEST(false, ("Failed for rect:", r, "; Scale level:", scale, "; Etalon size:", v2.size(), "; Index size:", v1.size()));
+// }
+
+// if (!v2.empty() && (scale < scales::GetUpperScale()))
+// {
+// m2::RectD r1, r2;
+// r.DivideByGreaterSize(r1, r2);
+// rects.push_back(r1);
+// rects.push_back(r2);
+// }
+// }
+// }
}