diff options
Diffstat (limited to 'phrase-extract')
-rw-r--r-- | phrase-extract/ExtractedRule.h | 10 | ||||
-rw-r--r-- | phrase-extract/extract-rules-main.cpp | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/phrase-extract/ExtractedRule.h b/phrase-extract/ExtractedRule.h index e879b96c4..2eeed1d30 100644 --- a/phrase-extract/ExtractedRule.h +++ b/phrase-extract/ExtractedRule.h @@ -26,7 +26,7 @@ #include <sstream> #include <map> -#include "extract-ghkm/PhraseOrientation.h" +#include "PhraseOrientation.h" namespace MosesTraining { @@ -51,8 +51,8 @@ public: int endS; float count; double pcfgScore; - Syntax::GHKM::PhraseOrientation::REO_CLASS l2rOrientation; - Syntax::GHKM::PhraseOrientation::REO_CLASS r2lOrientation; + PhraseOrientation::REO_CLASS l2rOrientation; + PhraseOrientation::REO_CLASS r2lOrientation; ExtractedRule(int sT, int eT, int sS, int eS) : source() @@ -71,8 +71,8 @@ public: , endS(eS) , count(0) , pcfgScore(0.0) - , l2rOrientation(Syntax::GHKM::PhraseOrientation::REO_CLASS_UNKNOWN) - , r2lOrientation(Syntax::GHKM::PhraseOrientation::REO_CLASS_UNKNOWN) + , l2rOrientation(PhraseOrientation::REO_CLASS_UNKNOWN) + , r2lOrientation(PhraseOrientation::REO_CLASS_UNKNOWN) { } }; diff --git a/phrase-extract/extract-rules-main.cpp b/phrase-extract/extract-rules-main.cpp index 49db5797c..6f2d742f4 100644 --- a/phrase-extract/extract-rules-main.cpp +++ b/phrase-extract/extract-rules-main.cpp @@ -46,7 +46,7 @@ #include "XmlTree.h" #include "InputFileStream.h" #include "OutputFileStream.h" -#include "extract-ghkm/PhraseOrientation.h" +#include "PhraseOrientation.h" using namespace std; using namespace MosesTraining; @@ -63,7 +63,7 @@ private: Moses::OutputFileStream& m_extractFileInv; Moses::OutputFileStream& m_extractFileContext; Moses::OutputFileStream& m_extractFileContextInv; - Syntax::GHKM::PhraseOrientation m_phraseOrientation; + PhraseOrientation m_phraseOrientation; vector< ExtractedRule > m_extractedRules; @@ -406,7 +406,7 @@ void ExtractTask::extractRules() // initialize phrase orientation scoring object (for lexicalized reordering model) if (m_options.phraseOrientation) { m_sentence.invertAlignment(); // fill m_sentence.alignedToS - m_phraseOrientation = Syntax::GHKM::PhraseOrientation(countS, countT, m_sentence.alignedToT, m_sentence.alignedToS, m_sentence.alignedCountS); + m_phraseOrientation = PhraseOrientation(countS, countT, m_sentence.alignedToT, m_sentence.alignedToS, m_sentence.alignedCountS); } // phrase repository for creating hiero phrases @@ -1021,11 +1021,11 @@ void ExtractTask::addRule( int startT, int endT, int startS, int endS, int count // phrase orientation (lexicalized reordering model) if (m_options.phraseOrientation) { - rule.l2rOrientation = m_phraseOrientation.GetOrientationInfo(startS,endS,Syntax::GHKM::PhraseOrientation::REO_DIR_L2R); - rule.r2lOrientation = m_phraseOrientation.GetOrientationInfo(startS,endS,Syntax::GHKM::PhraseOrientation::REO_DIR_R2L); + rule.l2rOrientation = m_phraseOrientation.GetOrientationInfo(startS,endS,PhraseOrientation::REO_DIR_L2R); + rule.r2lOrientation = m_phraseOrientation.GetOrientationInfo(startS,endS,PhraseOrientation::REO_DIR_R2L); // std::cerr << "span " << startS << " " << endS << std::endl; - // std::cerr << "phraseOrientationL2R " << m_phraseOrientation.GetOrientationInfo(startS,endS,Syntax::GHKM::PhraseOrientation::REO_DIR_L2R) << std::endl; - // std::cerr << "phraseOrientationR2L " << m_phraseOrientation.GetOrientationInfo(startS,endS,Syntax::GHKM::PhraseOrientation::REO_DIR_R2L) << std::endl; + // std::cerr << "phraseOrientationL2R " << m_phraseOrientation.GetOrientationInfo(startS,endS,PhraseOrientation::REO_DIR_L2R) << std::endl; + // std::cerr << "phraseOrientationR2L " << m_phraseOrientation.GetOrientationInfo(startS,endS,PhraseOrientation::REO_DIR_R2L) << std::endl; } addRuleToCollection( rule ); @@ -1101,8 +1101,8 @@ void ExtractTask::writeRulesToFile() m_phraseOrientation.WriteOrientation(out,rule->l2rOrientation); out << " "; m_phraseOrientation.WriteOrientation(out,rule->r2lOrientation); - m_phraseOrientation.IncrementPriorCount(Syntax::GHKM::PhraseOrientation::REO_DIR_L2R,rule->l2rOrientation,1); - m_phraseOrientation.IncrementPriorCount(Syntax::GHKM::PhraseOrientation::REO_DIR_R2L,rule->r2lOrientation,1); + m_phraseOrientation.IncrementPriorCount(PhraseOrientation::REO_DIR_L2R,rule->l2rOrientation,1); + m_phraseOrientation.IncrementPriorCount(PhraseOrientation::REO_DIR_R2L,rule->r2lOrientation,1); out << "}}"; } out << "\n"; @@ -1234,7 +1234,7 @@ void writePhraseOrientationPriors(const string &fileName) { ofstream outFile; outFile.open(fileName.c_str()); - Syntax::GHKM::PhraseOrientation::WritePriorCounts(outFile); + PhraseOrientation::WritePriorCounts(outFile); outFile.close(); } |