Merge ../mosesdecoder into perf_moses2

1 files changed, 0 insertions, 13 deletions

diff --git a/moses/SearchNormal.cpp b/moses/SearchNormal.cpp
index c0a191048..bb798c061 100644
--- a/moses/SearchNormal.cpp
+++ b/moses/SearchNormal.cpp
@@ -24,15 +24,6 @@ SearchNormal(Manager& manager, const InputType &source,
 {
   VERBOSE(1, "Translating: " << m_source << endl);
 
-  // m_beam_width = manager.options().search.beam_width;
-  // m_stack_size = manager.options().search.stack_size;
-  // m_stack_diversity = manager.options().search.stack_diversity;
-  // m_timeout = manager.options().search.timeout;
-  // m_max_distortion = manager.options().reordering.max_distortion;
-
-  // only if constraint decoding (having to match a specified output)
-  // long sentenceID = source.GetTranslationId();
-
   // initialize the stacks: create data structure and set limits
   std::vector < HypothesisStackNormal >::iterator iterStack;
   for (size_t ind = 0 ; ind < m_hypoStackColl.size() ; ++ind) {
@@ -82,8 +73,6 @@ ProcessOneStack(HypothesisStack* hstack)
  */
 void SearchNormal::Decode()
 {
-  // SentenceStats &stats = m_manager.GetSentenceStats();
-
   // initial seed hypothesis: nothing translated, no words produced
   const Bitmap &initBitmap = m_bitmaps.GetInitialBitmap();
   Hypothesis *hypo = new Hypothesis(m_manager, m_source, m_initialTransOpt, initBitmap, m_manager.GetNextHypoId());
@@ -109,7 +98,6 @@ SearchNormal::
 ProcessOneHypothesis(const Hypothesis &hypothesis)
 {
   // since we check for reordering limits, its good to have that limit handy
-  // int maxDistortion  = StaticData::Instance().GetMaxDistortion();
   bool isWordLattice = m_source.GetType() == WordLatticeInput;
 
   const Bitmap &hypoBitmap = hypothesis.GetWordsBitmap();
@@ -297,7 +285,6 @@ void SearchNormal::ExpandHypothesis(const Hypothesis &hypothesis,
                                     float estimatedScore,
                                     const Bitmap &bitmap)
 {
-  const StaticData &staticData = StaticData::Instance();
   SentenceStats &stats = m_manager.GetSentenceStats();
 
   Hypothesis *newHypo;