diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2014-07-18 23:36:53 +0400 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2014-07-18 23:36:53 +0400 |
commit | b10760f4283140a5bb285b3e68ca3eee9800de99 (patch) | |
tree | ea226aa46f2fdbfac4c93f55665e98b80e2fbada /moses/Parameter.cpp | |
parent | 353eff77d30b18e1930d3e9855a8f08d196df8d7 (diff) |
delete PhraseTableImplementation. Old enum
Diffstat (limited to 'moses/Parameter.cpp')
-rw-r--r-- | moses/Parameter.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/moses/Parameter.cpp b/moses/Parameter.cpp index 10ac56627..fb41d9a3c 100644 --- a/moses/Parameter.cpp +++ b/moses/Parameter.cpp @@ -36,6 +36,7 @@ using namespace std; namespace Moses { + /** define allowed parameters */ Parameter::Parameter() { @@ -513,29 +514,29 @@ void Parameter::ConvertWeightArgsPhraseModel(const string &oldWeightName) } UTIL_THROW_IF2(token.size() < 5, "Phrase table must have at least 5 scores"); - PhraseTableImplementation implementation = (PhraseTableImplementation) Scan<int>(token[0]); + int implementation = Scan<int>(token[0]); string ptType; switch (implementation) { - case Memory: + case 0: // Memory ptType = "PhraseDictionaryMemory"; break; - case Binary: + case 1: // Binary ptType = "PhraseDictionaryBinary"; break; - case OnDisk: + case 2: // OnDisk ptType = "PhraseDictionaryOnDisk"; break; - case SCFG: + case 6: // SCFG ptType = "PhraseDictionaryMemory"; break; - case Compact: + case 12: // Compact ptType = "PhraseDictionaryCompact"; break; - case SuffixArray: + case 8: // SuffixArray ptType = "PhraseDictionarySuffixArray"; break; - case DSuffixArray: + case 14: // DSuffixArray ptType = "PhraseDictionaryDynSuffixArray"; break; default: @@ -591,7 +592,7 @@ void Parameter::ConvertWeightArgsPhraseModel(const string &oldWeightName) ptLine << "num-features=" << numScoreComponent << " "; ptLine << "table-limit=" << maxTargetPhrase[currDict] << " "; - if (implementation == SuffixArray || implementation == DSuffixArray) { + if (implementation == 8 || implementation == 14) { ptLine << "target-path=" << token[5] << " "; ptLine << "alignment-path=" << token[6] << " "; } |