diff options
author | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
---|---|---|
committer | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-12-13 14:52:47 +0300 |
commit | e4eb201c52be74fee74399a6f35fcbe8eb85d834 (patch) | |
tree | 7792ef96d63262f6e28f1857741e1162c7dccbc4 /moses/DecodeGraph.h | |
parent | cea2d9d8bb34a81660974cae20d66aefec4e0468 (diff) | |
parent | a0b6b6a341e74b47bbef4652ad7fd928cf91e17c (diff) |
merged master into dynamic-models and solved conflicts
Diffstat (limited to 'moses/DecodeGraph.h')
-rw-r--r-- | moses/DecodeGraph.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/moses/DecodeGraph.h b/moses/DecodeGraph.h index dd3100f45..ebb7ef9e1 100644 --- a/moses/DecodeGraph.h +++ b/moses/DecodeGraph.h @@ -38,7 +38,7 @@ class DecodeGraph { protected: std::list<const DecodeStep*> m_steps; - size_t m_position; + size_t m_id; // contiguous unique id, starting from 0 size_t m_maxChartSpan; size_t m_backoff; @@ -46,15 +46,15 @@ public: /** * position: The position of this graph within the decode sequence. **/ - DecodeGraph(size_t position) - : m_position(position) + DecodeGraph(size_t id) + : m_id(id) , m_maxChartSpan(NOT_FOUND) , m_backoff(0) {} // for chart decoding - DecodeGraph(size_t position, size_t maxChartSpan) - : m_position(position) + DecodeGraph(size_t id, size_t maxChartSpan) + : m_id(id) , m_maxChartSpan(maxChartSpan) { } @@ -90,8 +90,8 @@ public: m_backoff = backoff; } - size_t GetPosition() const { - return m_position; + size_t GetId() const { + return m_id; } }; |