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

[search] Add Clone() to the trie's iterator.

Browse source
This commit is contained in:
Yury Melnichek 2011-08-16 11:23:15 +02:00 • committed by Alex Zolotarev
parent 22df4ad8f3
commit 0a46504d50
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coding/trie.hpp
View file

@ -28,6 +28,7 @@ public:
virtual ~Iterator() {}
virtual Iterator<ValueT, EdgeValueT> * Clone() const = 0;
virtual Iterator<ValueT, EdgeValueT> * GoToEdge(uint32_t i) const = 0;
};

15
coding/trie_reader.hpp
View file

@ -11,13 +11,14 @@ namespace trie
namespace reader
{
template <class ReaderT, class ValueReaderT, typename EdgeValueT>
template <class ValueReaderT, typename EdgeValueT>
class LeafIterator0 : public Iterator<typename ValueReaderT::ValueType, EdgeValueT>
{
public:
typedef typename ValueReaderT::ValueType ValueType;
typedef EdgeValueT EdgeValueType;
template <class ReaderT>
LeafIterator0(ReaderT const & reader, ValueReaderT const & valueReader)
{
uint32_t const size = static_cast<uint32_t>(reader.Size());
@ -34,6 +35,11 @@ public:
ASSERT_EQUAL(size, src.Pos(), ());
}
Iterator<ValueType, EdgeValueType> * Clone() const
{
return new LeafIterator0<ValueReaderT, EdgeValueT>(*this);
}
Iterator<ValueType, EdgeValueType> * GoToEdge(uint32_t i) const
{
ASSERT(false, (i));
@ -75,6 +81,11 @@ public:
ParseNode(baseChar);
}
Iterator<ValueType, EdgeValueType> * Clone() const
{
return new Iterator0<ReaderT, ValueReaderT, EdgeValueReaderT>(*this);
}
Iterator<ValueType, EdgeValueType> * GoToEdge(uint32_t i) const
{
ASSERT_LESS(i, this->m_edge.size(), ());
@ -100,7 +111,7 @@ public:
*/
{
if (m_edgeInfo[i].m_isLeaf)
return new LeafIterator0<ReaderT, ValueReaderT, EdgeValueType>(
return new LeafIterator0<ValueReaderT, EdgeValueType>(
m_reader.SubReader(offset, size), m_valueReader);
else
return new Iterator0<ReaderT, ValueReaderT, EdgeValueReaderT>(