ChartDecoding isn't the only syntax algorithm

emjotde · Jun 18, 2013 · 1b87f29 · 1b87f29
1 parent c70537d
commit 1b87f29
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/mira/Decoder.cpp b/mira/Decoder.cpp
@@ -106,7 +106,7 @@ vector< vector<const Word*> > MosesDecoder::getNBest(const std::string& source,
     string filename)
 {
   StaticData &staticData = StaticData::InstanceNonConst();
-  bool chartDecoding = (staticData.GetSearchAlgorithm() == ChartDecoding);
+  bool chartDecoding = staticData.IsChart();
   initialize(staticData, source, sentenceid, bleuObjectiveWeight, bleuScoreWeight, avgRefLength, chartDecoding);
 
   // run the decoder
@@ -269,7 +269,7 @@ void MosesDecoder::outputNBestList(const std::string& source, size_t sentenceid,
                                    bool distinctNbest, bool avgRefLength, string filename, ofstream& streamOut)
 {
   StaticData &staticData = StaticData::InstanceNonConst();
-  bool chartDecoding = (staticData.GetSearchAlgorithm() == ChartDecoding);
+  bool chartDecoding = staticData.IsChart();
   initialize(staticData, source, sentenceid, bleuObjectiveWeight, bleuScoreWeight, avgRefLength, chartDecoding);
 
   if (chartDecoding) {

diff --git a/mira/Main.cpp b/mira/Main.cpp
@@ -416,8 +416,7 @@ int main(int argc, char** argv)
   decoder->setBleuParameters(disableBleuFeature, sentenceBleu, scaleByInputLength, scaleByAvgInputLength,
                              scaleByInverseLength, scaleByAvgInverseLength,
                              scaleByX, historySmoothing, bleu_smoothing_scheme, simpleHistoryBleu);
-  SearchAlgorithm searchAlgorithm = staticData.GetSearchAlgorithm();
-  bool chartDecoding = (searchAlgorithm == ChartDecoding);
+  bool chartDecoding = staticData.IsChart();
 
   // Optionally shuffle the sentences
   vector<size_t> order;
@@ -1800,7 +1799,7 @@ void decodeHopeOrFear(size_t rank, size_t size, size_t decode, string filename,
     vector< vector<const Word*> > nbestOutput = decoder->getNBest(input, sid, n, factor, bleuWeight, dummyFeatureValues[0],
         dummyBleuScores[0], dummyModelScores[0], n, realBleu, true, false, rank, 0, "");
     cerr << endl;
-    decoder->cleanup(StaticData::Instance().GetSearchAlgorithm() == ChartDecoding);
+    decoder->cleanup(StaticData::Instance().IsChart());
 
     for (size_t i = 0; i < nbestOutput.size(); ++i) {
       vector<const Word*> output = nbestOutput[i];

diff --git a/moses/FF/BleuScoreFeature.cpp b/moses/FF/BleuScoreFeature.cpp
@@ -24,10 +24,7 @@ int BleuScoreState::Compare(const FFState& o) const
   if (&o == this)
     return 0;
 
-  const StaticData &staticData = StaticData::Instance();
-  SearchAlgorithm searchAlgorithm = staticData.GetSearchAlgorithm();
-  bool chartDecoding = (searchAlgorithm == ChartDecoding);
-  if (chartDecoding)
+  if (StaticData::Instance().IsChart())
     return 0;
 
   const BleuScoreState& other = dynamic_cast<const BleuScoreState&>(o);