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

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2015-11-10 15:14:21 +03:00 • committed by Sergey Yershov
parent ef97e8dbaf
commit c0acca8e41
9 changed files with 26 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/World.mwm
View file

Binary file not shown.

BIN
data/WorldCoasts.mwm
View file

Binary file not shown.

BIN
data/minsk-pass.mwm
View file

Binary file not shown.

3
generator/dumper.cpp
View file

@ -203,8 +203,7 @@ namespace feature
trie::ForEachRef(*trieRoot, f, strings::UniString());
f.Finish();
auto freqTokenPairs = f.m_tokens;
for (size_t i = 0; i < min(maxTokensToShow, freqTokenPairs.size()); ++i)
for (size_t i = 0; i < min(maxTokensToShow, f.m_tokens.size()); ++i)
{
auto const & s = f.m_tokens[i].second;
cout << f.m_tokens[i].first << " " << strings::ToUtf8(s) << endl;

2
indexer/index_builder.cpp
View file

@ -8,7 +8,7 @@
namespace indexer
{
bool BuildIndexFromDataFile(string const & datFile, string const & tmpFile)
bool BuildIndexFromDataFile(string const & datFile, string const & tmpFile)
{
try
{

23
indexer/indexer_tests/succinct_trie_test.cpp
View file

@ -63,6 +63,19 @@ struct EmptyValueList
void Append(int) {}
};
struct EmptyValueReader
{
using ValueType = unsigned char;
EmptyValueReader() = default;
template <typename SourceT>
void operator()(SourceT &, ValueType & value) const
{
value = 0;
}
};
struct SimpleValueReader
{
public:
@ -147,9 +160,9 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke1)
MemReader memReader(buf.data(), buf.size());
using TEmptyValue = trie::EmptyValueReader::ValueType;
using TEmptyValue = EmptyValueReader::ValueType;
auto trieRoot = trie::ReadSuccinctTrie(memReader, trie::EmptyValueReader());
auto trieRoot = trie::ReadSuccinctTrie(memReader, EmptyValueReader());
TEST(trieRoot, ());
}
@ -166,7 +179,7 @@ UNIT_TEST(SuccinctTrie_Serialization_Smoke2)
MemReader memReader(buf.data(), buf.size());
using TEmptyValue = trie::EmptyValueReader::ValueType;
using TEmptyValue = EmptyValueReader::ValueType;
auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
TEST(trieRoot, ());
@ -188,7 +201,7 @@ UNIT_TEST(SuccinctTrie_Iterator)
MemReader memReader(buf.data(), buf.size());
using TEmptyValue = trie::EmptyValueReader::ValueType;
using TEmptyValue = EmptyValueReader::ValueType;
auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());
TEST(trieRoot, ());
@ -216,7 +229,7 @@ UNIT_TEST(SuccinctTrie_MoveToString)
BuildFromSimpleValueList(memWriter, data);
MemReader memReader(buf.data(), buf.size());
using TEmptyValue = trie::EmptyValueReader::ValueType;
using TEmptyValue = EmptyValueReader::ValueType;
auto trieRoot = trie::ReadSuccinctTrie(memReader, SimpleValueReader());

34
indexer/trie.hpp
View file

@ -8,12 +8,12 @@
namespace trie
{
typedef uint32_t TrieChar;
using TrieChar = uint32_t;
// 95 is a good value for the default baseChar, since both small and capital latin letters
// are less than +/- 32 from it and thus can fit into supershort edge.
// However 0 is used because the first byte is actually language id.
static uint32_t const DEFAULT_CHAR = 0;
uint32_t constexpr kDefaultChar = 0;
template <typename TValueList>
class Iterator
@ -32,40 +32,12 @@ public:
buffer_vector<Edge, 8> m_edge;
TValueList m_valueList;
virtual ~Iterator() {}
virtual ~Iterator() = default;
virtual unique_ptr<Iterator<TValueList>> Clone() const = 0;
virtual unique_ptr<Iterator<TValueList>> GoToEdge(size_t i) const = 0;
};
struct EmptyValueReader
{
typedef unsigned char ValueType;
EmptyValueReader() = default;
template <typename SourceT>
void operator()(SourceT &, ValueType & value) const
{
value = 0;
}
};
template <unsigned int N>
struct FixedSizeValueReader
{
struct ValueType
{
unsigned char m_data[N];
};
template <typename SourceT>
void operator()(SourceT & src, ValueType & value) const
{
src.Read(&value.m_data[0], N);
}
};
template <typename TValueList, typename TF, typename TString>
void ForEachRef(Iterator<TValueList> const & it, TF && f, TString const & s)
{

4
indexer/trie_builder.hpp
View file

@ -235,7 +235,7 @@ void Build(TSink & sink, TSerializer const & serializer, TIter const beg, TIter
using TNodeInfo = NodeInfo<TValueList>;
vector<TNodeInfo> nodes;
nodes.emplace_back(sink.Pos(), DEFAULT_CHAR);
nodes.emplace_back(sink.Pos(), kDefaultChar);
TTrieString prevKey;
@ -270,7 +270,7 @@ void Build(TSink & sink, TSerializer const & serializer, TIter const beg, TIter
PopNodes(sink, serializer, nodes, nodes.size() - 1);
// Write the root.
WriteNodeReverse(sink, serializer, DEFAULT_CHAR /* baseChar */, nodes.back(), true /* isRoot */);
WriteNodeReverse(sink, serializer, kDefaultChar /* baseChar */, nodes.back(), true /* isRoot */);
}
} // namespace trie

2
indexer/trie_reader.hpp
View file

@ -152,7 +152,7 @@ private:
template <class TReader, class TValueList, class TSerializer>
unique_ptr<Iterator<TValueList>> ReadTrie(TReader const & reader, TSerializer const & serializer)
{
return make_unique<Iterator0<TReader, TValueList, TSerializer>>(reader, DEFAULT_CHAR, serializer);
return make_unique<Iterator0<TReader, TValueList, TSerializer>>(reader, kDefaultChar, serializer);
}
} // namespace trie