rename ChartDecoding -> CYKPlus. Comment out CubeGrowing, not implementedmerge-cmd

5 files changed, 5 insertions, 7 deletions

diff --git a/moses/FF/BleuScoreFeature.cpp b/moses/FF/BleuScoreFeature.cpp
index 0d0a20797..ac1dacced 100644
--- a/moses/FF/BleuScoreFeature.cpp
+++ b/moses/FF/BleuScoreFeature.cpp
@@ -118,7 +118,7 @@ void BleuScoreFeature::SetParameter(const std::string& key, const std::string& v
       }
       string line;
       while (getline(in,line)) {
-        /*  if (GetSearchAlgorithm() == ChartDecoding) {
+        /*  if (GetSearchAlgorithm() == CYKPlus) {
         stringstream tmp;
         tmp << "<s> " << line << " </s>";
         line = tmp.str();
diff --git a/moses/FF/ConstrainedDecoding.cpp b/moses/FF/ConstrainedDecoding.cpp
index bfe412913..f5514b655 100644
--- a/moses/FF/ConstrainedDecoding.cpp
+++ b/moses/FF/ConstrainedDecoding.cpp
@@ -43,7 +43,7 @@ ConstrainedDecoding::ConstrainedDecoding(const std::string &line)
 void ConstrainedDecoding::Load()
 {
   const StaticData &staticData = StaticData::Instance();
-  bool addBeginEndWord = (staticData.GetSearchAlgorithm() == ChartDecoding) || (staticData.GetSearchAlgorithm() == ChartIncremental);
+  bool addBeginEndWord = (staticData.GetSearchAlgorithm() == CYKPlus) || (staticData.GetSearchAlgorithm() == ChartIncremental);
 
   for(size_t i = 0; i < m_paths.size(); ++i) {
     InputFileStream constraintFile(m_paths[i]);
diff --git a/moses/Search.cpp b/moses/Search.cpp
index 030071021..f6b8dc53a 100644
--- a/moses/Search.cpp
+++ b/moses/Search.cpp
@@ -25,8 +25,6 @@ Search *Search::CreateSearch(Manager& manager, const InputType &source,
     return new SearchNormal(manager,source, transOptColl);
   case CubePruning:
     return new SearchCubePruning(manager, source, transOptColl);
-  case CubeGrowing:
-    return NULL;
   case NormalBatch:
     return new SearchNormalBatch(manager, source, transOptColl);
   default:
diff --git a/moses/StaticData.h b/moses/StaticData.h
index 047314607..7bafdb73a 100644
--- a/moses/StaticData.h
+++ b/moses/StaticData.h
@@ -419,7 +419,7 @@ public:
     return m_searchAlgorithm;
   }
   bool IsChart() const {
-    return m_searchAlgorithm == ChartDecoding || m_searchAlgorithm == ChartIncremental;
+    return m_searchAlgorithm == CYKPlus || m_searchAlgorithm == ChartIncremental;
   }
 
   const ScoreComponentCollection& GetAllWeights() const {
diff --git a/moses/TypeDef.h b/moses/TypeDef.h
index d7cf3b367..d794b3b43 100644
--- a/moses/TypeDef.h
+++ b/moses/TypeDef.h
@@ -141,8 +141,8 @@ enum DictionaryFind {
 enum SearchAlgorithm {
   Normal				= 0
   ,CubePruning	= 1
-  ,CubeGrowing	= 2
-  ,ChartDecoding= 3
+  //,CubeGrowing	= 2
+  ,CYKPlus = 3
   ,NormalBatch  = 4
   ,ChartIncremental = 5
 };