diff options
author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-10-18 23:45:27 +0300 |
---|---|---|
committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-10-18 23:45:27 +0300 |
commit | b8b3d2111a20c6f401291160a01db4bc03ce3676 (patch) | |
tree | e01cf5f9fba018f6668a9c3aff76e80cccbd6809 /moses/Syntax | |
parent | bdb0227ee9648ea96e8ee266d32581c63762b8b0 (diff) | |
parent | f7839c42d5cf2de17e86ec16df5e2f541ba53c75 (diff) |
Merge branch 'master' of http://github.com/moses-smt/mosesdecoder into ranked-sampling
Diffstat (limited to 'moses/Syntax')
-rw-r--r-- | moses/Syntax/F2S/Manager.h | 2 | ||||
-rw-r--r-- | moses/Syntax/Manager.cpp | 2 | ||||
-rw-r--r-- | moses/Syntax/Manager.h | 3 | ||||
-rw-r--r-- | moses/Syntax/S2T/Manager-inl.h | 2 | ||||
-rw-r--r-- | moses/Syntax/S2T/Manager.h | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/moses/Syntax/F2S/Manager.h b/moses/Syntax/F2S/Manager.h index bcf1ff2bd..7514338f7 100644 --- a/moses/Syntax/F2S/Manager.h +++ b/moses/Syntax/F2S/Manager.h @@ -1,10 +1,10 @@ #pragma once -#include <set> #include <vector> #include <boost/shared_ptr.hpp> #include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include "moses/InputType.h" #include "moses/Syntax/KBestExtractor.h" diff --git a/moses/Syntax/Manager.cpp b/moses/Syntax/Manager.cpp index 5dd4c3b64..10b0d25c9 100644 --- a/moses/Syntax/Manager.cpp +++ b/moses/Syntax/Manager.cpp @@ -65,7 +65,7 @@ void Manager::OutputUnknowns(OutputCollector *collector) const long translationId = m_source.GetTranslationId(); std::ostringstream out; - for (std::set<Moses::Word>::const_iterator p = m_oovs.begin(); + for (boost::unordered_set<Moses::Word>::const_iterator p = m_oovs.begin(); p != m_oovs.end(); ++p) { out << *p; } diff --git a/moses/Syntax/Manager.h b/moses/Syntax/Manager.h index d62e2f72a..a80c756a8 100644 --- a/moses/Syntax/Manager.h +++ b/moses/Syntax/Manager.h @@ -1,5 +1,6 @@ #pragma once +#include <boost/unordered_set.hpp> #include "moses/InputType.h" #include "moses/BaseManager.h" @@ -50,7 +51,7 @@ public: virtual const SHyperedge *GetBestSHyperedge() const = 0; protected: - std::set<Word> m_oovs; + boost::unordered_set<Word> m_oovs; private: // Syntax-specific helper functions used to implement OutputNBest. diff --git a/moses/Syntax/S2T/Manager-inl.h b/moses/Syntax/S2T/Manager-inl.h index 67588eb94..422f14915 100644 --- a/moses/Syntax/S2T/Manager-inl.h +++ b/moses/Syntax/S2T/Manager-inl.h @@ -108,7 +108,7 @@ void Manager<Parser>::InitializeParsers(PChart &pchart, // Find the set of OOVs for this input. This function assumes that the // PChart argument has already been initialized from the input. template<typename Parser> -void Manager<Parser>::FindOovs(const PChart &pchart, std::set<Word> &oovs, +void Manager<Parser>::FindOovs(const PChart &pchart, boost::unordered_set<Word> &oovs, std::size_t maxOovWidth) { // Get the set of RuleTries. diff --git a/moses/Syntax/S2T/Manager.h b/moses/Syntax/S2T/Manager.h index 711d6f9d8..b0e6555cf 100644 --- a/moses/Syntax/S2T/Manager.h +++ b/moses/Syntax/S2T/Manager.h @@ -45,7 +45,7 @@ public: void OutputDetailedTranslationReport(OutputCollector *collector) const; private: - void FindOovs(const PChart &, std::set<Word> &, std::size_t); + void FindOovs(const PChart &, boost::unordered_set<Word> &, std::size_t); void InitializeCharts(); |