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

Add strip-test for T-like polygon. Minor statistic-calc fix.

Browse source
This commit is contained in:
vng 2011-01-16 17:41:20 +02:00 • committed by Alex Zolotarev
parent f69571c354
commit 3763703183
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
geometry/geometry_tests/polygon_test.cpp
View file

@ -66,7 +66,7 @@ namespace
void TestFindStrip(P const * beg, size_t n)
{
size_t const i = FindSingleStrip(n, IsDiagonalVisibleFunctor<P const *>(beg, beg + n));
TEST_LESS(i, n, ());
TEST_LESS ( i, n, () );
vector<size_t> test;
MakeSingleStripFromIndex(i, n, MakeBackInsertFunctor(test));
@ -74,7 +74,7 @@ namespace
sort(test.begin(), test.end());
unique(test.begin(), test.end());
TEST_EQUAL(test.size(), n, ());
TEST_EQUAL ( test.size(), n, () );
}
void TestFindStripMulti(P const * beg, size_t n)
@ -92,8 +92,9 @@ UNIT_TEST(FindSingleStrip)
}
{
P poly[] = { P(0, 0), P(2, -1), P(3, -1), P(3, 2), P(2, 2), P(2, 1), P(0, 1) };
TestFindStripMulti(poly, ARRAY_SIZE(poly));
P poly[] = { P(0, 0), P(2, 0), P(2, -1), P(3, -1), P(3, 2), P(2, 2), P(2, 1), P(0, 1) };
size_t const n = ARRAY_SIZE(poly);
TEST_EQUAL ( FindSingleStrip(n, IsDiagonalVisibleFunctor<P const *>(poly, poly + n)), n, () );
}
{

6
indexer/indexer_tool/statistics.cpp
View file

@ -59,7 +59,7 @@ namespace stats
uint32_t const datSize = f.GetAllSize();
m_info.m_all.Add(datSize);
//m_info.m_names.Add(f.GetNameSize());
m_info.m_types.Add(f.GetTypesSize());
//m_info.m_types.Add(f.GetTypesSize());
FeatureType::geom_stat_t geom = f.GetGeometrySize(-1);
FeatureType::geom_stat_t trg = f.GetTrianglesSize(-1);
@ -145,8 +145,8 @@ namespace stats
void PrintStatistic(MapInfo & info)
{
PrintInfo("DAT", info.m_all);
PrintInfo("NAMES", info.m_names);
PrintInfo("TYPES", info.m_types);
//PrintInfo("NAMES", info.m_names);
//PrintInfo("TYPES", info.m_types);
PrintTop<greater_size>("Top SIZE by Geometry Type", info.m_byGeomType);
PrintTop<greater_size>("Top SIZE by Classificator Type", info.m_byClassifType);

11
indexer/indexer_tool/statistics.hpp
View file

@ -55,14 +55,17 @@ namespace stats
set<GeneralInfoKey<TypeTag> > m_byClassifType;
set<GeneralInfoKey<uint32_t> > m_byPointsCount, m_byTrgCount;
GeneralInfo m_all, m_names, m_types;
GeneralInfo m_all; //, m_names, m_types;
template <class TKey, class TSet>
void AddToSet(TKey key, uint32_t sz, TSet & theSet)
{
// GCC doesn't allow to modify set value ...
const_cast<GeneralInfo &>(
theSet.insert(GeneralInfoKey<TKey>(key)).first->m_info).Add(sz);
if (sz > 0)
{
// GCC doesn't allow to modify set value ...
const_cast<GeneralInfo &>(
theSet.insert(GeneralInfoKey<TKey>(key)).first->m_info).Add(sz);
}
}
};