diff options
author | Patrick Simianer <p@simianer.de> | 2011-11-13 12:26:23 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2011-11-13 12:26:23 +0100 |
commit | effc9bfc40a0559ce36a155daa15e0dc53e93b75 (patch) | |
tree | 768a29ebad48089e3445c515d47f49c942f09124 /training | |
parent | ed8ca37550910a540e755ada119e814f13eeef03 (diff) | |
parent | a5592c9ab0266dbf4993e42e82e5a113316990ad (diff) |
merge upstream/master
Diffstat (limited to 'training')
-rw-r--r-- | training/augment_grammar.cc | 2 | ||||
-rw-r--r-- | training/test_ngram.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/training/augment_grammar.cc b/training/augment_grammar.cc index e89a92d5..1e5af9a1 100644 --- a/training/augment_grammar.cc +++ b/training/augment_grammar.cc @@ -18,7 +18,7 @@ using namespace std; vector<lm::WordIndex> word_map; lm::ngram::ProbingModel* ngram; -struct VMapper : public lm::ngram::EnumerateVocab { +struct VMapper : public lm::EnumerateVocab { VMapper(vector<lm::WordIndex>* out) : out_(out), kLM_UNKNOWN_TOKEN(0) { out_->clear(); } void Add(lm::WordIndex index, const StringPiece &str) { const WordID cdec_id = TD::Convert(str.as_string()); diff --git a/training/test_ngram.cc b/training/test_ngram.cc index c481b564..4597cc01 100644 --- a/training/test_ngram.cc +++ b/training/test_ngram.cc @@ -12,7 +12,7 @@ namespace po = boost::program_options; using namespace std; lm::ngram::ProbingModel* ngram; -struct GetVocab : public lm::ngram::EnumerateVocab { +struct GetVocab : public lm::EnumerateVocab { GetVocab(vector<lm::WordIndex>* out) : out_(out) { } void Add(lm::WordIndex index, const StringPiece &str) { out_->push_back(index); |