make TranslationModel subdirectory and move files from moses/ into it

This commit is contained in:
Hieu Hoang 2012-11-27 15:08:31 +00:00
parent a4cbaa51af
commit 59449f2925
40 changed files with 105 additions and 159 deletions

View File

@ -22,7 +22,7 @@
#include <iostream>
#include "moses/Util.h"
#include "moses/TargetPhrase.h"
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/DummyScoreProducers.h"
#include "TargetPhrase.h"
#include "OnDiskWrapper.h"

View File

@ -22,7 +22,7 @@
#include <iostream>
#include "moses/Util.h"
#include "moses/TargetPhraseCollection.h"
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "TargetPhraseCollection.h"
#include "Vocab.h"
#include "OnDiskWrapper.h"

View File

@ -746,66 +746,6 @@
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseBoundaryFeature.h</locationURI>
</link>
<link>
<name>PhraseDictionary.cpp</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionary.cpp</locationURI>
</link>
<link>
<name>PhraseDictionary.h</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionary.h</locationURI>
</link>
<link>
<name>PhraseDictionaryDynSuffixArray.cpp</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryDynSuffixArray.cpp</locationURI>
</link>
<link>
<name>PhraseDictionaryDynSuffixArray.h</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryDynSuffixArray.h</locationURI>
</link>
<link>
<name>PhraseDictionaryMemory.cpp</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryMemory.cpp</locationURI>
</link>
<link>
<name>PhraseDictionaryMemory.h</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryMemory.h</locationURI>
</link>
<link>
<name>PhraseDictionaryNode.cpp</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryNode.cpp</locationURI>
</link>
<link>
<name>PhraseDictionaryNode.h</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryNode.h</locationURI>
</link>
<link>
<name>PhraseDictionaryTree.cpp</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTree.cpp</locationURI>
</link>
<link>
<name>PhraseDictionaryTree.h</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTree.h</locationURI>
</link>
<link>
<name>PhraseDictionaryTreeAdaptor.cpp</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTreeAdaptor.cpp</locationURI>
</link>
<link>
<name>PhraseDictionaryTreeAdaptor.h</name>
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/PhraseDictionaryTreeAdaptor.h</locationURI>
</link>
<link>
<name>PhraseLengthFeature.cpp</name>
<type>1</type>
@ -1131,6 +1071,11 @@
<type>1</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/Timer.h</locationURI>
</link>
<link>
<name>TranslationModel</name>
<type>2</type>
<locationURI>PARENT-3-PROJECT_LOC/moses/TranslationModel</locationURI>
</link>
<link>
<name>TranslationOption.cpp</name>
<type>1</type>

View File

@ -7,7 +7,7 @@
#include "moses/Hypothesis.h"
#include "moses/Manager.h"
#include "moses/StaticData.h"
#include "moses/PhraseDictionaryDynSuffixArray.h"
#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h"
#include "moses/TranslationSystem.h"
#include "moses/TreeInput.h"
#include "moses/LMList.h"

View File

@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include "moses/DummyScoreProducers.h"
#include "moses/InputFileStream.h"
#include "moses/Incremental.h"
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/ChartTrellisPathList.h"
#include "moses/ChartTrellisPath.h"
#include "moses/ChartTrellisNode.h"

View File

@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "moses/LexicalReorderingTable.h"
#include "moses/StaticData.h"
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/GenerationDictionary.h"
#include "moses/TargetPhrase.h"
#include "moses/TargetPhraseCollection.h"

View File

@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#endif
#endif
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/ThreadPool.h"
#include "BlockHashIndex.h"

View File

@ -5,7 +5,7 @@
#include "FactorCollection.h"
#include "Util.h"
#include "PhraseDictionaryTreeAdaptor.h"
#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h"
#include "TranslationOptionCollectionConfusionNet.h"
#include "StaticData.h"
#include "Sentence.h"

View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
#include "DecodeStep.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "GenerationDictionary.h"
#include "StaticData.h"

View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
#include "DecodeStepTranslation.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "TranslationOption.h"
#include "TranslationOptionCollection.h"
#include "PartialTranslOptColl.h"

View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#define moses_DecodeStepTranslation_h
#include "DecodeStep.h"
#include "PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
namespace Moses
{

View File

@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "WordsBitmap.h"
#include "Sentence.h"
#include "Phrase.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "GenerationDictionary.h"
#include "ScoreComponentCollection.h"
#include "InputType.h"

View File

@ -32,6 +32,7 @@ lib moses :
CYKPlusParser/*.cpp
RuleTable/*.cpp
fuzzy-match/*.cpp
TranslationModel/*.cpp
: #exceptions
ThreadPool.cpp
SyntacticLanguageModel.cpp

View File

@ -3,7 +3,7 @@
//#include "LVoc.h" //need IPhrase
#include "StaticData.h"
#include "PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "GenerationDictionary.h"
#include "TargetPhrase.h"
#include "TargetPhraseCollection.h"

View File

@ -83,16 +83,16 @@ libmoses_la_HEADERS = \
PartialTranslOptColl.h \
Phrase.h \
PhraseBoundaryFeature.h \
PhraseDictionary.h \
moses/TranslationModel/PhraseDictionary.h \
PhraseDictionaryALSuffixArray.h \
PhraseDictionaryDynSuffixArray.h \
PhraseDictionaryMemory.h \
moses/TranslationModel/PhraseDictionaryDynSuffixArray.h \
moses/TranslationModel/PhraseDictionaryMemory.h \
PhraseDictionarySCFG.h \
PhraseDictionaryNode.h \
moses/TranslationModel/PhraseDictionaryNode.h \
PhraseDictionaryNodeSCFG.h \
PhraseDictionaryOnDisk.h \
PhraseDictionaryTree.h \
PhraseDictionaryTreeAdaptor.h \
moses/TranslationModel/PhraseDictionaryTree.h \
moses/TranslationModel/PhraseDictionaryTreeAdaptor.h \
PhraseLengthFeature.h \
PhrasePairFeature.h \
PrefixTree.h \

View File

@ -5,10 +5,10 @@
#define moses_PDTAimp_h
#include "StaticData.h" // needed for factor splitter
#include "PhraseDictionaryTree.h"
#include "moses/TranslationModel/PhraseDictionaryTree.h"
#include "UniqueObject.h"
#include "InputFileStream.h"
#include "PhraseDictionaryTreeAdaptor.h"
#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h"
#include "SparsePhraseDictionaryFeature.h"
#include "Util.h"

View File

@ -19,7 +19,7 @@
#pragma once
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/InputType.h"
#include "moses/NonTerminal.h"
#include "moses/fuzzy-match/FuzzyMatchWrapper.h"

View File

@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "PhraseDictionaryNodeSCFG.h"
#include "moses/TargetPhrase.h"
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
namespace Moses
{

View File

@ -24,7 +24,7 @@
#include <map>
#include <vector>
#include <string>
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "OnDiskPt/OnDiskWrapper.h"
#include "OnDiskPt/Word.h"
#include "OnDiskPt/PhraseNode.h"

View File

@ -19,7 +19,7 @@
#pragma once
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/InputType.h"
#include "moses/NonTerminal.h"
#include "PhraseDictionaryNodeSCFG.h"

View File

@ -19,7 +19,7 @@
#pragma once
#include "moses/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/TypeDef.h"
#include <string>

View File

@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdexcept>
#include "Sentence.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "TranslationOptionCollectionText.h"
#include "StaticData.h"
#include "Util.h"

View File

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <string>
#include "util/check.hh"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "DecodeStepTranslation.h"
#include "DecodeStepGeneration.h"
#include "GenerationDictionary.h"
@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "GlobalLexicalModelUnlimited.h"
#include "SentenceStats.h"
#include "PhraseBoundaryFeature.h"
#include "PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "SparsePhraseDictionaryFeature.h"
#include "PhrasePairFeature.h"
#include "PhraseLengthFeature.h"

View File

@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "util/tokenize_piece.hh"
#include "TargetPhrase.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "GenerationDictionary.h"
#include "LM/Base.h"
#include "StaticData.h"

View File

@ -19,23 +19,23 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
#include "PhraseDictionary.h"
#include "PhraseDictionaryTreeAdaptor.h"
#include "RuleTable/PhraseDictionarySCFG.h"
#include "RuleTable/PhraseDictionaryOnDisk.h"
#include "RuleTable/PhraseDictionaryALSuffixArray.h"
#include "RuleTable/PhraseDictionaryFuzzyMatch.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h"
#include "moses/RuleTable/PhraseDictionarySCFG.h"
#include "moses/RuleTable/PhraseDictionaryOnDisk.h"
#include "moses/RuleTable/PhraseDictionaryALSuffixArray.h"
#include "moses/RuleTable/PhraseDictionaryFuzzyMatch.h"
#ifndef WIN32
#include "PhraseDictionaryDynSuffixArray.h"
#include "CompactPT/PhraseDictionaryCompact.h"
#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h"
#include "moses/CompactPT/PhraseDictionaryCompact.h"
#endif
#include "RuleTable/UTrie.h"
#include "moses/RuleTable/UTrie.h"
#include "StaticData.h"
#include "InputType.h"
#include "TranslationOption.h"
#include "UserMessage.h"
#include "moses/StaticData.h"
#include "moses/InputType.h"
#include "moses/TranslationOption.h"
#include "moses/UserMessage.h"
using namespace std;

View File

@ -34,11 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <boost/thread/tss.hpp>
#endif
#include "Phrase.h"
#include "TargetPhrase.h"
#include "Dictionary.h"
#include "TargetPhraseCollection.h"
#include "DecodeFeature.h"
#include "moses/Phrase.h"
#include "moses/TargetPhrase.h"
#include "moses/Dictionary.h"
#include "moses/TargetPhraseCollection.h"
#include "moses/DecodeFeature.h"
namespace Moses
{

View File

@ -1,7 +1,7 @@
#include "PhraseDictionaryDynSuffixArray.h"
#include "FactorCollection.h"
#include "StaticData.h"
#include "TargetPhrase.h"
#include "moses/TranslationModel/PhraseDictionaryDynSuffixArray.h"
#include "moses/FactorCollection.h"
#include "moses/StaticData.h"
#include "moses/TargetPhrase.h"
#include <iomanip>
using namespace std;

View File

@ -3,8 +3,8 @@
#include <map>
#include "PhraseDictionary.h"
#include "BilingualDynSuffixArray.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/BilingualDynSuffixArray.h"
namespace Moses
{

View File

@ -30,15 +30,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "util/file_piece.hh"
#include "util/tokenize_piece.hh"
#include "PhraseDictionaryMemory.h"
#include "FactorCollection.h"
#include "Word.h"
#include "Util.h"
#include "InputFileStream.h"
#include "StaticData.h"
#include "WordsRange.h"
#include "UserMessage.h"
#include "SparsePhraseDictionaryFeature.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "moses/FactorCollection.h"
#include "moses/Word.h"
#include "moses/Util.h"
#include "moses/InputFileStream.h"
#include "moses/StaticData.h"
#include "moses/WordsRange.h"
#include "moses/UserMessage.h"
#include "moses/SparsePhraseDictionaryFeature.h"
using namespace std;

View File

@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef moses_PhraseDictionaryMemory_h
#define moses_PhraseDictionaryMemory_h
#include "PhraseDictionary.h"
#include "PhraseDictionaryNode.h"
#include "moses/TranslationModel/PhraseDictionary.h"
#include "moses/TranslationModel/PhraseDictionaryNode.h"
namespace Moses
{

View File

@ -19,9 +19,9 @@ License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
***********************************************************************/
#include "PhraseDictionaryNode.h"
#include "TargetPhrase.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryNode.h"
#include "moses/TargetPhrase.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
namespace Moses
{

View File

@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <map>
#include <vector>
#include <iterator>
#include "Word.h"
#include "TargetPhraseCollection.h"
#include "moses/Word.h"
#include "moses/TargetPhraseCollection.h"
namespace Moses
{

View File

@ -1,7 +1,7 @@
// $Id$
// vim:tabstop=2
#include "FeatureVector.h"
#include "PhraseDictionaryTree.h"
#include "moses/FeatureVector.h"
#include "moses/TranslationModel/PhraseDictionaryTree.h"
#include <map>
#include "util/check.hh"
#include <sstream>

View File

@ -11,17 +11,17 @@
#include <boost/thread/mutex.hpp>
#endif
#include "TypeDef.h"
#include "Dictionary.h"
#include "moses/TypeDef.h"
#include "moses/Dictionary.h"
#include "PrefixTree.h"
#include "File.h"
#include "ObjectPool.h"
#include "LexicalReorderingTable.h"
#include "LVoc.h"
#include "TypeDef.h"
#include "Util.h"
#include "moses/PrefixTree.h"
#include "moses/File.h"
#include "moses/ObjectPool.h"
#include "moses/LexicalReorderingTable.h"
#include "moses/LVoc.h"
#include "moses/TypeDef.h"
#include "moses/Util.h"
namespace Moses
{

View File

@ -1,19 +1,19 @@
// $Id$
#include "PhraseDictionaryTreeAdaptor.h"
#include "moses/TranslationModel/PhraseDictionaryTreeAdaptor.h"
#include <sys/stat.h>
#include <algorithm>
#include "PhraseDictionaryTree.h"
#include "Phrase.h"
#include "FactorCollection.h"
#include "InputFileStream.h"
#include "InputType.h"
#include "ConfusionNet.h"
#include "Sentence.h"
#include "StaticData.h"
#include "UniqueObject.h"
#include "PDTAimp.h"
#include "UserMessage.h"
#include "moses/TranslationModel/PhraseDictionaryTree.h"
#include "moses/Phrase.h"
#include "moses/FactorCollection.h"
#include "moses/InputFileStream.h"
#include "moses/InputType.h"
#include "moses/ConfusionNet.h"
#include "moses/Sentence.h"
#include "moses/StaticData.h"
#include "moses/UniqueObject.h"
#include "moses/PDTAimp.h"
#include "moses/UserMessage.h"
namespace Moses
{

View File

@ -5,9 +5,9 @@
#include <vector>
#include "util/check.hh"
#include "TypeDef.h"
#include "PhraseDictionaryMemory.h"
#include "TargetPhraseCollection.h"
#include "moses/TypeDef.h"
#include "moses/TargetPhraseCollection.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
namespace Moses
{

View File

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "TranslationOption.h"
#include "WordsBitmap.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "GenerationDictionary.h"
#include "LMList.h"
#include "LexicalReordering.h"

View File

@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "Sentence.h"
#include "DecodeStep.h"
#include "LM/Base.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "FactorCollection.h"
#include "InputType.h"
#include "LexicalReordering.h"

View File

@ -3,7 +3,7 @@
#include "TranslationOptionCollectionConfusionNet.h"
#include "ConfusionNet.h"
#include "DecodeStep.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "FactorCollection.h"
namespace Moses

View File

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include "TranslationOptionCollectionText.h"
#include "Sentence.h"
#include "DecodeStep.h"
#include "PhraseDictionaryMemory.h"
#include "moses/TranslationModel/PhraseDictionaryMemory.h"
#include "FactorCollection.h"
#include "WordsRange.h"