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

[indexer] Added move assignment operator for CategoriesIndex.

Browse source
This commit is contained in:
VladiMihaylenko 2016-04-27 17:07:07 +03:00 • committed by Alex Zolotarev
parent 60f44c0699
commit 21e50e2d5e
8 changed files with 54 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
base/mem_trie.hpp
View file

@ -21,6 +21,8 @@ public:
other.m_numNodes = 0;
}
MemTrie & operator=(MemTrie && other) = default;
// Adds a key-value pair to the trie.
void Add(TString const & key, TValue const & value)
{
@ -61,6 +63,8 @@ private:
Node(Node && other) = default;
Node & operator=(Node && other) = default;
~Node()
{
for (auto const & move : m_moves)

4
editor/new_feature_categories.cpp
View file

@ -36,7 +36,7 @@ void NewFeatureCategories::AddLanguage(string const & lang)
for (auto const & type : m_types)
{
m_index.AddCategoryByTypeAndLang(type, langCode);
names.push_back(m_index.GetCategoriesHolder().GetReadableFeatureType(type, langCode));
names.push_back(m_index.GetCategoriesHolder()->GetReadableFeatureType(type, langCode));
}
my::SortUnique(names);
m_categoryNames[lang] = names;
@ -50,7 +50,7 @@ vector<string> NewFeatureCategories::Search(string const & query, string const &
vector<string> result(resultTypes.size());
for (size_t i = 0; i < result.size(); ++i)
result[i] = m_index.GetCategoriesHolder().GetReadableFeatureType(resultTypes[i], langCode);
result[i] = m_index.GetCategoriesHolder()->GetReadableFeatureType(resultTypes[i], langCode);
my::SortUnique(result);
return result;
}

4
editor/new_feature_categories.hpp
View file

@ -27,6 +27,10 @@ public:
{
}
NewFeatureCategories() = default;
NewFeatureCategories & operator=(NewFeatureCategories && other) = default;
// Adds all known synonyms in language |lang| for all categories that
// can be applied to a newly added feature.
void AddLanguage(string const & lang);

46
indexer/categories_index.cpp
View file

@ -52,11 +52,11 @@ namespace indexer
{
void CategoriesIndex::AddCategoryByTypeAndLang(uint32_t type, int8_t lang)
{
m_catHolder.ForEachNameByType(type, [&](TCategory::Name const & name)
{
if (name.m_locale == lang)
TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
});
m_catHolder->ForEachNameByType(type, [&](TCategory::Name const & name)
{
if (name.m_locale == lang)
TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
});
}
void CategoriesIndex::AddCategoryByTypeAllLangs(uint32_t type)
@ -67,23 +67,23 @@ void CategoriesIndex::AddCategoryByTypeAllLangs(uint32_t type)
void CategoriesIndex::AddAllCategoriesInLang(int8_t lang)
{
m_catHolder.ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat)
{
for (auto const & name : cat.m_synonyms)
{
if (name.m_locale == lang)
TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
}
});
m_catHolder->ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat)
{
for (auto const & name : cat.m_synonyms)
{
if (name.m_locale == lang)
TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
}
});
}
void CategoriesIndex::AddAllCategoriesInAllLangs()
{
m_catHolder.ForEachTypeAndCategory([this](uint32_t type, TCategory const & cat)
{
for (auto const & name : cat.m_synonyms)
TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
});
m_catHolder->ForEachTypeAndCategory([this](uint32_t type, TCategory const & cat)
{
for (auto const & name : cat.m_synonyms)
TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
});
}
void CategoriesIndex::GetCategories(string const & query, vector<TCategory> & result) const
@ -91,11 +91,11 @@ void CategoriesIndex::GetCategories(string const & query, vector<TCategory> & re
vector<uint32_t> types;
GetAssociatedTypes(query, types);
my::SortUnique(types);
m_catHolder.ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat)
{
if (binary_search(types.begin(), types.end(), type))
result.push_back(cat);
});
m_catHolder->ForEachTypeAndCategory([&](uint32_t type, TCategory const & cat)
{
if (binary_search(types.begin(), types.end(), type))
result.push_back(cat);
});
}
void CategoriesIndex::GetAssociatedTypes(string const & query, vector<uint32_t> & result) const

11
indexer/categories_index.hpp
View file

@ -18,17 +18,18 @@ class CategoriesIndex
public:
using TCategory = CategoriesHolder::Category;
CategoriesIndex() : m_catHolder(GetDefaultCategories()) {}
CategoriesIndex() : m_catHolder(&GetDefaultCategories()) {}
CategoriesIndex(CategoriesHolder const & catHolder) : m_catHolder(catHolder) {}
CategoriesIndex(CategoriesHolder const * catHolder) : m_catHolder(catHolder) {}
CategoriesIndex(CategoriesIndex && other)
: m_catHolder(other.m_catHolder), m_trie(move(other.m_trie))
{
}
CategoriesHolder const & GetCategoriesHolder() const { return m_catHolder; }
CategoriesIndex & operator=(CategoriesIndex && other) = default;
CategoriesHolder const * GetCategoriesHolder() const { return m_catHolder; }
// Adds all categories that match |type|. Only synonyms
// in language |lang| are added. See indexer/categories_holder.cpp
// for language enumeration.
@ -58,11 +59,11 @@ public:
void GetAssociatedTypes(string const & query, vector<uint32_t> & result) const;
#ifdef DEBUG
inline int GetNumTrieNodes() const { return m_trie.GetNumNodes(); }
inline size_t GetNumTrieNodes() const { return m_trie.GetNumNodes(); }
#endif
private:
CategoriesHolder const & m_catHolder;
CategoriesHolder const * m_catHolder = nullptr;
my::MemTrie<string, uint32_t> m_trie;
};
} // namespace indexer

6
indexer/indexer_tests/categories_test.cpp
View file

@ -107,7 +107,7 @@ UNIT_TEST(CategoriesIndex_Smoke)
CategoriesHolder holder(
make_unique<MemReader>(g_testCategoriesTxt, sizeof(g_testCategoriesTxt) - 1));
CategoriesIndex index(holder);
CategoriesIndex index(&holder);
uint32_t type1 = classif().GetTypeByPath({"amenity", "bench"});
uint32_t type2 = classif().GetTypeByPath({"place", "village"});
@ -136,7 +136,7 @@ UNIT_TEST(CategoriesIndex_Smoke)
index.AddCategoryByTypeAndLang(type2, lang1);
testTypes("i", {type1, type2});
CategoriesIndex fullIndex(holder);
CategoriesIndex fullIndex(&holder);
fullIndex.AddCategoryByTypeAllLangs(type1);
fullIndex.AddCategoryByTypeAllLangs(type2);
vector<CategoriesHolder::Category> cats;
@ -167,7 +167,7 @@ UNIT_TEST(CategoriesIndex_MultipleTokens)
classificator::Load();
CategoriesHolder holder(make_unique<MemReader>(kCategories, sizeof(kCategories) - 1));
CategoriesIndex index(holder);
CategoriesIndex index(&holder);
index.AddAllCategoriesInAllLangs();
auto testTypes = [&](string const & query, vector<uint32_t> const & expected)

4
xcode/editor/editor.xcodeproj/project.pbxproj
View file

@ -27,6 +27,7 @@
34FFB34D1C316A7600BFF6C3 /* server_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 34FFB34B1C316A7600BFF6C3 /* server_api.hpp */; };
F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */; };
F60F02EF1C92CBF1003A0AF6 /* editor_notes.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */; };
F6DF5F2F1CD0FD6A00A87154 /* new_feature_categories.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF5F2E1CD0FD6A00A87154 /* new_feature_categories.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@ -52,6 +53,7 @@
34FFB34B1C316A7600BFF6C3 /* server_api.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = server_api.hpp; sourceTree = "<group>"; };
F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_notes.cpp; sourceTree = "<group>"; };
F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = editor_notes.hpp; sourceTree = "<group>"; };
F6DF5F2E1CD0FD6A00A87154 /* new_feature_categories.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_feature_categories.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -85,6 +87,7 @@
341138731C15AE02002E3B3E /* Editor */ = {
isa = PBXGroup;
children = (
F6DF5F2E1CD0FD6A00A87154 /* new_feature_categories.cpp */,
F60F02EC1C92CBF1003A0AF6 /* editor_notes.cpp */,
F60F02ED1C92CBF1003A0AF6 /* editor_notes.hpp */,
34527C4F1C89B1770015050E /* editor_config.cpp */,
@ -196,6 +199,7 @@
34527C511C89B1770015050E /* editor_config.cpp in Sources */,
34FFB34C1C316A7600BFF6C3 /* server_api.cpp in Sources */,
F60F02EE1C92CBF1003A0AF6 /* editor_notes.cpp in Sources */,
F6DF5F2F1CD0FD6A00A87154 /* new_feature_categories.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

8
xcode/indexer/indexer.xcodeproj/project.pbxproj
View file

@ -152,6 +152,8 @@
6758AED31BB4413000C26E27 /* drules_selector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6758AECF1BB4413000C26E27 /* drules_selector.cpp */; };
6758AED41BB4413000C26E27 /* drules_selector.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 6758AED01BB4413000C26E27 /* drules_selector.hpp */; };
67F183731BD4FCF500AB1840 /* map_style.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67F183721BD4FCF500AB1840 /* map_style.cpp */; };
F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */; };
F6DF5F311CD0FD9A00A87154 /* categories_index.hpp in Headers */ = {isa = PBXBuildFile; fileRef = F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@ -318,6 +320,8 @@
6758AECF1BB4413000C26E27 /* drules_selector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drules_selector.cpp; sourceTree = "<group>"; };
6758AED01BB4413000C26E27 /* drules_selector.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = drules_selector.hpp; sourceTree = "<group>"; };
67F183721BD4FCF500AB1840 /* map_style.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map_style.cpp; sourceTree = "<group>"; };
F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = categories_index.cpp; sourceTree = "<group>"; };
F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = categories_index.hpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -437,6 +441,8 @@
6753409C1A3F53CB00A0A8C3 /* indexer */ = {
isa = PBXGroup;
children = (
F6DF5F301CD0FD9A00A87154 /* categories_index.hpp */,
F6DF5F2C1CD0FC9D00A87154 /* categories_index.cpp */,
34583BC11C88552100F94664 /* cuisines.cpp */,
34583BC21C88552100F94664 /* cuisines.hpp */,
34583BC31C88552100F94664 /* editable_map_object.cpp */,
@ -571,6 +577,7 @@
347F337F1C454242009758CC /* trie_builder.hpp in Headers */,
6753412D1A3F540F00A0A8C3 /* geometry_serialization.hpp in Headers */,
6753414C1A3F540F00A0A8C3 /* tree_structure.hpp in Headers */,
F6DF5F311CD0FD9A00A87154 /* categories_index.hpp in Headers */,
347F337D1C454242009758CC /* succinct_trie_builder.hpp in Headers */,
675341381A3F540F00A0A8C3 /* mwm_set.hpp in Headers */,
670EE56D1B60033A001E8064 /* unique_index.hpp in Headers */,
@ -763,6 +770,7 @@
670C611A1AB065B100C38A8C /* sort_and_merge_intervals_test.cpp in Sources */,
670C61101AB065B100C38A8C /* features_offsets_table_test.cpp in Sources */,
670C611B1AB065B100C38A8C /* test_polylines.cpp in Sources */,
F6DF5F2D1CD0FC9D00A87154 /* categories_index.cpp in Sources */,
674125131B4C02F100A3E828 /* map_style_reader.cpp in Sources */,
675341141A3F540F00A0A8C3 /* feature_covering.cpp in Sources */,
56C74C1D1C749E4700B71B9F /* categories_holder.cpp in Sources */,