drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-23 03:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[generator] Fixed ordering for many subtypes

Browse Source 
Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
This commit is contained in:
Yannik Bloscheck
2026-01-21 22:17:50 +01:00
parent ea29b0869f
commit 66a71869d2
4 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libs/indexer/feature_data.cpp
View File

@@ -92,17 +92,20 @@ public:
/// @return Type score, less is better.
uint8_t Score(uint32_t t) const
{
if (IsIn(0, t))
return 1;
ftype::TruncValue(t, 2);
if (IsIn(3, t))
return 4;
ftype::TruncValue(t, 1);
if (IsIn(2, t))
return 3;
ftype::TruncValue(t, 1);
if (IsIn(1, t))
return 2;
if (IsIn(0, t))
return 1;
return 0;
}
@@ -118,7 +121,7 @@ private:
{
// Fill types that will be taken into account last,
// when we have many types for POI.
base::StringIL const types1[] = {
base::StringIL const types2[] = {
// 1-arity
{"building:part"}, {"hwtag"}, {"psurface"}, {"internet_access"}, {"organic"},
{"wheelchair"}, {"cuisine"}, {"area:highway"}, {"fee"},
@@ -126,15 +129,18 @@ private:
Classificator const & c = classif();
m_types[0].push_back(c.GetTypeByPath({"building"}));
for (auto const subtype : ftypes::Subtypes::Instance().AllSubtypes())
m_types[0].push_back(subtype);
m_types[1].reserve(std::size(types1));
for (auto const & type : types1)
m_types[1].push_back(c.GetTypeByPath(type));
m_types[1].push_back(c.GetTypeByPath({"building"}));
m_types[2].reserve(std::size(types2));
for (auto const & type : types2)
m_types[2].push_back(c.GetTypeByPath(type));
// Put _most_ useless types here, that are not fit in the arity logic above.
// This change is for generator, to eliminate "lit" type first when max types count exceeded.
m_types[2].push_back(c.GetTypeByPath({"hwtag", "lit"}));
m_types[3].push_back(c.GetTypeByPath({"hwtag", "lit"}));
for (auto & v : m_types)
std::sort(v.begin(), v.end());
@@ -142,7 +148,7 @@ private:
bool IsIn(uint8_t idx, uint32_t t) const { return std::binary_search(m_types[idx].begin(), m_types[idx].end(), t); }
vector<uint32_t> m_types[3];
vector<uint32_t> m_types[4];
};
} // namespace
@@ -196,9 +202,9 @@ void TypesHolder::SortBySpec()
std::stable_sort(begin(), end(), [&checker, &getPriority, &subtypes](uint32_t t1, uint32_t t2)
{
std::optional<bool> const comaprisonResultBasedOnTypeRelation = subtypes.ComaprisonResultBasedOnTypeRelation(t1, t2);
if (comaprisonResultBasedOnTypeRelation.has_value())
return comaprisonResultBasedOnTypeRelation.value();
std::optional<bool> const comparisonResultBasedOnTypeRelation = subtypes.ComparisonResultBasedOnTypeRelation(t1, t2);
if (comparisonResultBasedOnTypeRelation.has_value())
return comparisonResultBasedOnTypeRelation.value();
int const p1 = getPriority(t1);
int const p2 = getPriority(t2);