rename

contrib/other-builds/moses2/Jamfile

@@ -41,9 +41,10 @@ alias deps :  ../../..//z ../../..//boost_iostreams ../../..//boost_filesystem .
 		PhraseBased/Hypothesis.cpp 
  	 	PhraseBased/Manager.cpp 
  	 	PhraseBased/Search.cpp
- 	 	PhraseBased/SearchNormal.cpp
- 	 	PhraseBased/Stack.cpp 
- 	 	PhraseBased/Stacks.cpp 
+ 	 	
+		PhraseBased/Normal/Search.cpp
+ 	 	PhraseBased/Normal/Stack.cpp 
+ 	 	PhraseBased/Normal/Stacks.cpp 
 
 		PhraseBased/CubePruningMiniStack/Misc.cpp
  	 	PhraseBased/CubePruningMiniStack/Search.cpp

contrib/other-builds/moses2/PhraseBased/Manager.cpp

@@ -8,7 +8,7 @@
 #include <vector>
 #include <sstream>
 #include "Manager.h"
-#include "SearchNormal.h"
+#include "Normal/Search.h"
 #include "CubePruningMiniStack/Search.h"
 #include "CubePruningPerMiniStack/Search.h"
 #include "CubePruningPerBitmap/Search.h"

contrib/other-builds/moses2/PhraseBased/Normal/Search.cpp

@@ -5,16 +5,16 @@
  *      Author: hieu
  */
 
+#include "Search.h"
 #include <algorithm>
 #include <boost/foreach.hpp>
-#include "SearchNormal.h"
 #include "Stack.h"
-#include "Manager.h"
-#include "../InputPaths.h"
-#include "../TargetPhrases.h"
-#include "../Phrase.h"
-#include "../System.h"
-#include "../Sentence.h"
+#include "../Manager.h"
+#include "../../InputPaths.h"
+#include "../../TargetPhrases.h"
+#include "../../Phrase.h"
+#include "../../System.h"
+#include "../../Sentence.h"
 
 using namespace std;
 

contrib/other-builds/moses2/PhraseBased/Normal/Search.h

@@ -8,11 +8,11 @@
 #ifndef SEARCHNORMAL_H_
 #define SEARCHNORMAL_H_
 #include <vector>
-#include "../legacy/Range.h"
-#include "../legacy/Bitmap.h"
-#include "../TypeDef.h"
-#include "ArcLists.h"
-#include "Search.h"
+#include "../../legacy/Range.h"
+#include "../../legacy/Bitmap.h"
+#include "../../TypeDef.h"
+#include "../ArcLists.h"
+#include "../Search.h"
 #include "Stacks.h"
 
 namespace Moses2

contrib/other-builds/moses2/PhraseBased/Normal/Stack.cpp

@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <boost/foreach.hpp>
 #include "Stack.h"
-#include "Hypothesis.h"
-#include "../Scores.h"
+#include "../Hypothesis.h"
+#include "../../Scores.h"
 
 using namespace std;
 

contrib/other-builds/moses2/PhraseBased/Normal/Stack.h

@@ -8,10 +8,10 @@
 
 #include <boost/unordered_set.hpp>
 #include <deque>
-#include "Hypothesis.h"
-#include "../TypeDef.h"
-#include "../Recycler.h"
-#include "../legacy/Util2.h"
+#include "../Hypothesis.h"
+#include "../../TypeDef.h"
+#include "../../Recycler.h"
+#include "../../legacy/Util2.h"
 
 namespace Moses2
 {

contrib/other-builds/moses2/PhraseBased/Normal/Stacks.h

@@ -9,7 +9,7 @@
 
 #include <vector>
 #include "Stack.h"
-#include "../Recycler.h"
+#include "../../Recycler.h"
 
 namespace Moses2
 {