diff --git a/contrib/tm-mt-integration/Makefile b/contrib/fuzzy-match/Makefile similarity index 100% rename from contrib/tm-mt-integration/Makefile rename to contrib/fuzzy-match/Makefile diff --git a/contrib/tm-mt-integration/Match.h b/contrib/fuzzy-match/Match.h similarity index 100% rename from contrib/tm-mt-integration/Match.h rename to contrib/fuzzy-match/Match.h diff --git a/contrib/tm-mt-integration/SentenceAlignment.h b/contrib/fuzzy-match/SentenceAlignment.h similarity index 100% rename from contrib/tm-mt-integration/SentenceAlignment.h rename to contrib/fuzzy-match/SentenceAlignment.h diff --git a/contrib/tm-mt-integration/SuffixArray.cpp b/contrib/fuzzy-match/SuffixArray.cpp similarity index 100% rename from contrib/tm-mt-integration/SuffixArray.cpp rename to contrib/fuzzy-match/SuffixArray.cpp diff --git a/contrib/tm-mt-integration/SuffixArray.h b/contrib/fuzzy-match/SuffixArray.h similarity index 100% rename from contrib/tm-mt-integration/SuffixArray.h rename to contrib/fuzzy-match/SuffixArray.h diff --git a/contrib/tm-mt-integration/Util.cpp b/contrib/fuzzy-match/Util.cpp similarity index 100% rename from contrib/tm-mt-integration/Util.cpp rename to contrib/fuzzy-match/Util.cpp diff --git a/contrib/tm-mt-integration/Util.h b/contrib/fuzzy-match/Util.h similarity index 100% rename from contrib/tm-mt-integration/Util.h rename to contrib/fuzzy-match/Util.h diff --git a/contrib/tm-mt-integration/Vocabulary.cpp b/contrib/fuzzy-match/Vocabulary.cpp similarity index 100% rename from contrib/tm-mt-integration/Vocabulary.cpp rename to contrib/fuzzy-match/Vocabulary.cpp diff --git a/contrib/tm-mt-integration/Vocabulary.h b/contrib/fuzzy-match/Vocabulary.h similarity index 100% rename from contrib/tm-mt-integration/Vocabulary.h rename to contrib/fuzzy-match/Vocabulary.h diff --git a/contrib/tm-mt-integration/fuzzy-match2.cpp b/contrib/fuzzy-match/fuzzy-match2.cpp similarity index 100% rename from contrib/tm-mt-integration/fuzzy-match2.cpp rename to contrib/fuzzy-match/fuzzy-match2.cpp diff --git a/contrib/tm-mt-integration/fuzzy-match2.h b/contrib/fuzzy-match/fuzzy-match2.h similarity index 100% rename from contrib/tm-mt-integration/fuzzy-match2.h rename to contrib/fuzzy-match/fuzzy-match2.h diff --git a/contrib/tm-mt-integration/make-xml-from-match.perl b/contrib/fuzzy-match/make-xml-from-match.perl similarity index 100% rename from contrib/tm-mt-integration/make-xml-from-match.perl rename to contrib/fuzzy-match/make-xml-from-match.perl diff --git a/contrib/tm-mt-integration/old/fuzzy-match.cpp b/contrib/fuzzy-match/old/fuzzy-match.cpp similarity index 100% rename from contrib/tm-mt-integration/old/fuzzy-match.cpp rename to contrib/fuzzy-match/old/fuzzy-match.cpp diff --git a/contrib/tm-mt-integration/old/get-multiple-translations-for-uniq-sources.perl b/contrib/fuzzy-match/old/get-multiple-translations-for-uniq-sources.perl similarity index 100% rename from contrib/tm-mt-integration/old/get-multiple-translations-for-uniq-sources.perl rename to contrib/fuzzy-match/old/get-multiple-translations-for-uniq-sources.perl diff --git a/contrib/tm-mt-integration/old/make-pt-from-tm.perl b/contrib/fuzzy-match/old/make-pt-from-tm.perl similarity index 100% rename from contrib/tm-mt-integration/old/make-pt-from-tm.perl rename to contrib/fuzzy-match/old/make-pt-from-tm.perl diff --git a/contrib/tm-mt-integration/old/make-pt-from-tm2.perl b/contrib/fuzzy-match/old/make-pt-from-tm2.perl similarity index 100% rename from contrib/tm-mt-integration/old/make-pt-from-tm2.perl rename to contrib/fuzzy-match/old/make-pt-from-tm2.perl diff --git a/contrib/tm-mt-integration/old/make-xml-from-match-multiple.perl b/contrib/fuzzy-match/old/make-xml-from-match-multiple.perl similarity index 100% rename from contrib/tm-mt-integration/old/make-xml-from-match-multiple.perl rename to contrib/fuzzy-match/old/make-xml-from-match-multiple.perl diff --git a/contrib/tm-mt-integration/suffix-test.cpp b/contrib/fuzzy-match/suffix-test.cpp similarity index 100% rename from contrib/tm-mt-integration/suffix-test.cpp rename to contrib/fuzzy-match/suffix-test.cpp diff --git a/contrib/other-builds/moses.xcodeproj/project.pbxproj b/contrib/other-builds/moses.xcodeproj/project.pbxproj index af0a88978..c71827c13 100644 --- a/contrib/other-builds/moses.xcodeproj/project.pbxproj +++ b/contrib/other-builds/moses.xcodeproj/project.pbxproj @@ -24,7 +24,6 @@ 1EAC363B14CDC79300DF97C3 /* LoaderHiero.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EAC363214CDC79300DF97C3 /* LoaderHiero.h */; }; 1EAC363C14CDC79300DF97C3 /* LoaderStandard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EAC363314CDC79300DF97C3 /* LoaderStandard.cpp */; }; 1EAC363D14CDC79300DF97C3 /* LoaderStandard.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EAC363414CDC79300DF97C3 /* LoaderStandard.h */; }; - 1EC72A1E15C201D8002D0CBC /* SentenceAlignment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC72A1D15C201D8002D0CBC /* SentenceAlignment.cpp */; }; 1EC7374614B977AB00238410 /* AlignmentInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC735D314B977AA00238410 /* AlignmentInfo.cpp */; }; 1EC7374714B977AB00238410 /* AlignmentInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC735D414B977AA00238410 /* AlignmentInfo.h */; }; 1EC7374814B977AB00238410 /* AlignmentInfoCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC735D514B977AA00238410 /* AlignmentInfoCollection.cpp */; }; @@ -262,14 +261,6 @@ 1EC7387D14B977AB00238410 /* WordsRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC7373F14B977AB00238410 /* WordsRange.h */; }; 1EC7387F14B977AB00238410 /* XmlOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EC7374214B977AB00238410 /* XmlOption.cpp */; }; 1EC7388014B977AB00238410 /* XmlOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EC7374314B977AB00238410 /* XmlOption.h */; }; - 1ECF13E215C1A8CB00EA1DCE /* Vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF13E015C1A8CB00EA1DCE /* Vocabulary.cpp */; }; - 1ECF13E315C1A8CB00EA1DCE /* Vocabulary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ECF13E115C1A8CB00EA1DCE /* Vocabulary.h */; }; - 1ECF13E715C1AF6800EA1DCE /* SentenceAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ECF13E415C1AF6800EA1DCE /* SentenceAlignment.h */; }; - 1ECF13E815C1AF6800EA1DCE /* SuffixArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF13E515C1AF6800EA1DCE /* SuffixArray.cpp */; }; - 1ECF13E915C1AF6800EA1DCE /* SuffixArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ECF13E615C1AF6800EA1DCE /* SuffixArray.h */; }; - 1ECF13EF15C1E2C700EA1DCE /* TMMTWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ECF13EE15C1E2C700EA1DCE /* TMMTWrapper.h */; }; - 1ECF13F115C1E2E700EA1DCE /* TMMTWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ECF13F015C1E2E700EA1DCE /* TMMTWrapper.cpp */; }; - 1ECF13F315C1F75200EA1DCE /* Match.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ECF13F215C1F75200EA1DCE /* Match.h */; }; 1EDA804F14D19EEF003D2191 /* ApplicableRuleTrie.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EDA803614D19EEF003D2191 /* ApplicableRuleTrie.cpp */; }; 1EDA805014D19EEF003D2191 /* ApplicableRuleTrie.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EDA803714D19EEF003D2191 /* ApplicableRuleTrie.h */; }; 1EDA805614D19EEF003D2191 /* IntermediateVarSpanNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EDA804314D19EEF003D2191 /* IntermediateVarSpanNode.h */; }; @@ -308,6 +299,15 @@ 1EDA809114D19FBF003D2191 /* UTrie.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EDA808314D19FBF003D2191 /* UTrie.h */; }; 1EDA809214D19FBF003D2191 /* UTrieNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EDA808414D19FBF003D2191 /* UTrieNode.cpp */; }; 1EDA809314D19FBF003D2191 /* UTrieNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EDA808514D19FBF003D2191 /* UTrieNode.h */; }; + 1EE418ED15C7FDCB0028F9AB /* Match.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE418E415C7FDCB0028F9AB /* Match.h */; }; + 1EE418EE15C7FDCB0028F9AB /* SentenceAlignment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EE418E515C7FDCB0028F9AB /* SentenceAlignment.cpp */; }; + 1EE418EF15C7FDCB0028F9AB /* SentenceAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE418E615C7FDCB0028F9AB /* SentenceAlignment.h */; }; + 1EE418F015C7FDCB0028F9AB /* SuffixArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EE418E715C7FDCB0028F9AB /* SuffixArray.cpp */; }; + 1EE418F115C7FDCB0028F9AB /* SuffixArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE418E815C7FDCB0028F9AB /* SuffixArray.h */; }; + 1EE418F215C7FDCB0028F9AB /* TMMTWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EE418E915C7FDCB0028F9AB /* TMMTWrapper.cpp */; }; + 1EE418F315C7FDCB0028F9AB /* TMMTWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE418EA15C7FDCB0028F9AB /* TMMTWrapper.h */; }; + 1EE418F415C7FDCB0028F9AB /* Vocabulary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EE418EB15C7FDCB0028F9AB /* Vocabulary.cpp */; }; + 1EE418F515C7FDCB0028F9AB /* Vocabulary.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE418EC15C7FDCB0028F9AB /* Vocabulary.h */; }; 1EF0709314B9EFCC0052152A /* ParallelBackoff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1EF0709114B9EFCC0052152A /* ParallelBackoff.cpp */; }; 1EF0709414B9EFCC0052152A /* ParallelBackoff.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EF0709214B9EFCC0052152A /* ParallelBackoff.h */; }; 1EF8F2C4159A61970047B613 /* HypoList.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EF8F2C3159A61970047B613 /* HypoList.h */; }; @@ -331,7 +331,6 @@ 1EAC363214CDC79300DF97C3 /* LoaderHiero.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LoaderHiero.h; path = ../../moses/src/RuleTable/LoaderHiero.h; sourceTree = ""; }; 1EAC363314CDC79300DF97C3 /* LoaderStandard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LoaderStandard.cpp; path = ../../moses/src/RuleTable/LoaderStandard.cpp; sourceTree = ""; }; 1EAC363414CDC79300DF97C3 /* LoaderStandard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LoaderStandard.h; path = ../../moses/src/RuleTable/LoaderStandard.h; sourceTree = ""; }; - 1EC72A1D15C201D8002D0CBC /* SentenceAlignment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SentenceAlignment.cpp; path = "../../moses/src/tm-mt/SentenceAlignment.cpp"; sourceTree = ""; }; 1EC735D314B977AA00238410 /* AlignmentInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AlignmentInfo.cpp; path = ../../moses/src/AlignmentInfo.cpp; sourceTree = ""; }; 1EC735D414B977AA00238410 /* AlignmentInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AlignmentInfo.h; path = ../../moses/src/AlignmentInfo.h; sourceTree = ""; }; 1EC735D514B977AA00238410 /* AlignmentInfoCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AlignmentInfoCollection.cpp; path = ../../moses/src/AlignmentInfoCollection.cpp; sourceTree = ""; }; @@ -571,14 +570,6 @@ 1EC7373F14B977AB00238410 /* WordsRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordsRange.h; path = ../../moses/src/WordsRange.h; sourceTree = ""; }; 1EC7374214B977AB00238410 /* XmlOption.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XmlOption.cpp; path = ../../moses/src/XmlOption.cpp; sourceTree = ""; }; 1EC7374314B977AB00238410 /* XmlOption.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XmlOption.h; path = ../../moses/src/XmlOption.h; sourceTree = ""; }; - 1ECF13E015C1A8CB00EA1DCE /* Vocabulary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Vocabulary.cpp; path = "../../moses/src/tm-mt/Vocabulary.cpp"; sourceTree = ""; }; - 1ECF13E115C1A8CB00EA1DCE /* Vocabulary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Vocabulary.h; path = "../../moses/src/tm-mt/Vocabulary.h"; sourceTree = ""; }; - 1ECF13E415C1AF6800EA1DCE /* SentenceAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentenceAlignment.h; path = "../../moses/src/tm-mt/SentenceAlignment.h"; sourceTree = ""; }; - 1ECF13E515C1AF6800EA1DCE /* SuffixArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SuffixArray.cpp; path = "../../moses/src/tm-mt/SuffixArray.cpp"; sourceTree = ""; }; - 1ECF13E615C1AF6800EA1DCE /* SuffixArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SuffixArray.h; path = "../../moses/src/tm-mt/SuffixArray.h"; sourceTree = ""; }; - 1ECF13EE15C1E2C700EA1DCE /* TMMTWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TMMTWrapper.h; path = "../../moses/src/tm-mt/TMMTWrapper.h"; sourceTree = ""; }; - 1ECF13F015C1E2E700EA1DCE /* TMMTWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TMMTWrapper.cpp; path = "../../moses/src/tm-mt/TMMTWrapper.cpp"; sourceTree = ""; }; - 1ECF13F215C1F75200EA1DCE /* Match.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Match.h; path = "../../moses/src/tm-mt/Match.h"; sourceTree = ""; }; 1EDA803614D19EEF003D2191 /* ApplicableRuleTrie.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ApplicableRuleTrie.cpp; path = ../../moses/src/Scope3Parser/ApplicableRuleTrie.cpp; sourceTree = ""; }; 1EDA803714D19EEF003D2191 /* ApplicableRuleTrie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ApplicableRuleTrie.h; path = ../../moses/src/Scope3Parser/ApplicableRuleTrie.h; sourceTree = ""; }; 1EDA804314D19EEF003D2191 /* IntermediateVarSpanNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IntermediateVarSpanNode.h; path = ../../moses/src/Scope3Parser/IntermediateVarSpanNode.h; sourceTree = ""; }; @@ -617,6 +608,15 @@ 1EDA808314D19FBF003D2191 /* UTrie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UTrie.h; path = ../../moses/src/RuleTable/UTrie.h; sourceTree = ""; }; 1EDA808414D19FBF003D2191 /* UTrieNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UTrieNode.cpp; path = ../../moses/src/RuleTable/UTrieNode.cpp; sourceTree = ""; }; 1EDA808514D19FBF003D2191 /* UTrieNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UTrieNode.h; path = ../../moses/src/RuleTable/UTrieNode.h; sourceTree = ""; }; + 1EE418E415C7FDCB0028F9AB /* Match.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Match.h; path = "../../moses/src/fuzzy-match/Match.h"; sourceTree = ""; }; + 1EE418E515C7FDCB0028F9AB /* SentenceAlignment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SentenceAlignment.cpp; path = "../../moses/src/fuzzy-match/SentenceAlignment.cpp"; sourceTree = ""; }; + 1EE418E615C7FDCB0028F9AB /* SentenceAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SentenceAlignment.h; path = "../../moses/src/fuzzy-match/SentenceAlignment.h"; sourceTree = ""; }; + 1EE418E715C7FDCB0028F9AB /* SuffixArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SuffixArray.cpp; path = "../../moses/src/fuzzy-match/SuffixArray.cpp"; sourceTree = ""; }; + 1EE418E815C7FDCB0028F9AB /* SuffixArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SuffixArray.h; path = "../../moses/src/fuzzy-match/SuffixArray.h"; sourceTree = ""; }; + 1EE418E915C7FDCB0028F9AB /* TMMTWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TMMTWrapper.cpp; path = "../../moses/src/fuzzy-match/TMMTWrapper.cpp"; sourceTree = ""; }; + 1EE418EA15C7FDCB0028F9AB /* TMMTWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TMMTWrapper.h; path = "../../moses/src/fuzzy-match/TMMTWrapper.h"; sourceTree = ""; }; + 1EE418EB15C7FDCB0028F9AB /* Vocabulary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Vocabulary.cpp; path = "../../moses/src/fuzzy-match/Vocabulary.cpp"; sourceTree = ""; }; + 1EE418EC15C7FDCB0028F9AB /* Vocabulary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Vocabulary.h; path = "../../moses/src/fuzzy-match/Vocabulary.h"; sourceTree = ""; }; 1EF0709114B9EFCC0052152A /* ParallelBackoff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ParallelBackoff.cpp; sourceTree = ""; }; 1EF0709214B9EFCC0052152A /* ParallelBackoff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ParallelBackoff.h; sourceTree = ""; }; 1EF8F2C3159A61970047B613 /* HypoList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HypoList.h; path = ../../moses/src/HypoList.h; sourceTree = ""; }; @@ -647,7 +647,7 @@ 08FB7795FE84155DC02AAC07 /* Source */ = { isa = PBXGroup; children = ( - 1ECF13DE15C1A82400EA1DCE /* tm-mt */, + 1ECF13DE15C1A82400EA1DCE /* fuzzy-match */, 1EDA803514D19ECD003D2191 /* Scope3Parser */, 1EDA803414D19EB8003D2191 /* CYKPlusParser */, 1EC7365B14B977AA00238410 /* LM */, @@ -959,20 +959,20 @@ path = ../../moses/src/LM; sourceTree = ""; }; - 1ECF13DE15C1A82400EA1DCE /* tm-mt */ = { + 1ECF13DE15C1A82400EA1DCE /* fuzzy-match */ = { isa = PBXGroup; children = ( - 1ECF13F215C1F75200EA1DCE /* Match.h */, - 1ECF13E415C1AF6800EA1DCE /* SentenceAlignment.h */, - 1EC72A1D15C201D8002D0CBC /* SentenceAlignment.cpp */, - 1ECF13E515C1AF6800EA1DCE /* SuffixArray.cpp */, - 1ECF13E615C1AF6800EA1DCE /* SuffixArray.h */, - 1ECF13E015C1A8CB00EA1DCE /* Vocabulary.cpp */, - 1ECF13E115C1A8CB00EA1DCE /* Vocabulary.h */, - 1ECF13EE15C1E2C700EA1DCE /* TMMTWrapper.h */, - 1ECF13F015C1E2E700EA1DCE /* TMMTWrapper.cpp */, + 1EE418E415C7FDCB0028F9AB /* Match.h */, + 1EE418E515C7FDCB0028F9AB /* SentenceAlignment.cpp */, + 1EE418E615C7FDCB0028F9AB /* SentenceAlignment.h */, + 1EE418E715C7FDCB0028F9AB /* SuffixArray.cpp */, + 1EE418E815C7FDCB0028F9AB /* SuffixArray.h */, + 1EE418E915C7FDCB0028F9AB /* TMMTWrapper.cpp */, + 1EE418EA15C7FDCB0028F9AB /* TMMTWrapper.h */, + 1EE418EB15C7FDCB0028F9AB /* Vocabulary.cpp */, + 1EE418EC15C7FDCB0028F9AB /* Vocabulary.h */, ); - name = "tm-mt"; + name = "fuzzy-match"; sourceTree = ""; }; 1EDA803414D19EB8003D2191 /* CYKPlusParser */ = { @@ -1192,11 +1192,11 @@ 1E1D824115AC29BB00FE42E9 /* FileHandler.h in Headers */, 1E0BA41915B70E5F00AC70E1 /* PhraseDictionaryTMExtract.h in Headers */, 1E619EA215B8713700C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.h in Headers */, - 1ECF13E315C1A8CB00EA1DCE /* Vocabulary.h in Headers */, - 1ECF13E715C1AF6800EA1DCE /* SentenceAlignment.h in Headers */, - 1ECF13E915C1AF6800EA1DCE /* SuffixArray.h in Headers */, - 1ECF13EF15C1E2C700EA1DCE /* TMMTWrapper.h in Headers */, - 1ECF13F315C1F75200EA1DCE /* Match.h in Headers */, + 1EE418ED15C7FDCB0028F9AB /* Match.h in Headers */, + 1EE418EF15C7FDCB0028F9AB /* SentenceAlignment.h in Headers */, + 1EE418F115C7FDCB0028F9AB /* SuffixArray.h in Headers */, + 1EE418F315C7FDCB0028F9AB /* TMMTWrapper.h in Headers */, + 1EE418F515C7FDCB0028F9AB /* Vocabulary.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1384,10 +1384,10 @@ 1E1D824015AC29BB00FE42E9 /* FileHandler.cpp in Sources */, 1E0BA41815B70E5F00AC70E1 /* PhraseDictionaryTMExtract.cpp in Sources */, 1E619EA115B8713700C2D7A7 /* ChartRuleLookupManagerMemoryPerSentence.cpp in Sources */, - 1ECF13E215C1A8CB00EA1DCE /* Vocabulary.cpp in Sources */, - 1ECF13E815C1AF6800EA1DCE /* SuffixArray.cpp in Sources */, - 1ECF13F115C1E2E700EA1DCE /* TMMTWrapper.cpp in Sources */, - 1EC72A1E15C201D8002D0CBC /* SentenceAlignment.cpp in Sources */, + 1EE418EE15C7FDCB0028F9AB /* SentenceAlignment.cpp in Sources */, + 1EE418F015C7FDCB0028F9AB /* SuffixArray.cpp in Sources */, + 1EE418F215C7FDCB0028F9AB /* TMMTWrapper.cpp in Sources */, + 1EE418F415C7FDCB0028F9AB /* Vocabulary.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/moses/src/Jamfile b/moses/src/Jamfile index f9dc624c1..091802f25 100644 --- a/moses/src/Jamfile +++ b/moses/src/Jamfile @@ -16,6 +16,6 @@ lib moses_internal : [ glob *.cpp DynSAInclude/*.cpp : PhraseDictionary.cpp ThreadPool.cpp SyntacticLanguageModel.cpp ] synlm ThreadPool headers ; -lib moses : PhraseDictionary.cpp moses_internal CYKPlusParser//CYKPlusParser LM//LM RuleTable//RuleTable Scope3Parser//Scope3Parser tm-mt//tm-mt headers ../..//z ../../OnDiskPt//OnDiskPt ../..//boost_filesystem ; +lib moses : PhraseDictionary.cpp moses_internal CYKPlusParser//CYKPlusParser LM//LM RuleTable//RuleTable Scope3Parser//Scope3Parser fuzzy-match//fuzzy-match headers ../..//z ../../OnDiskPt//OnDiskPt ../..//boost_filesystem ; alias headers-to-install : [ glob-tree *.h ] ; diff --git a/moses/src/fuzzy-match/Jamfile b/moses/src/fuzzy-match/Jamfile new file mode 100644 index 000000000..3635297a8 --- /dev/null +++ b/moses/src/fuzzy-match/Jamfile @@ -0,0 +1 @@ +lib fuzzy-match : [ glob *.cpp ] ..//moses_internal ; diff --git a/moses/src/tm-mt/Match.h b/moses/src/fuzzy-match/Match.h similarity index 100% rename from moses/src/tm-mt/Match.h rename to moses/src/fuzzy-match/Match.h diff --git a/moses/src/tm-mt/SentenceAlignment.cpp b/moses/src/fuzzy-match/SentenceAlignment.cpp similarity index 91% rename from moses/src/tm-mt/SentenceAlignment.cpp rename to moses/src/fuzzy-match/SentenceAlignment.cpp index a94df989a..1559c404c 100644 --- a/moses/src/tm-mt/SentenceAlignment.cpp +++ b/moses/src/fuzzy-match/SentenceAlignment.cpp @@ -7,7 +7,7 @@ // #include -#include "tm-mt/SentenceAlignment.h" +#include "fuzzy-match/SentenceAlignment.h" namespace tmmt { diff --git a/moses/src/tm-mt/SentenceAlignment.h b/moses/src/fuzzy-match/SentenceAlignment.h similarity index 95% rename from moses/src/tm-mt/SentenceAlignment.h rename to moses/src/fuzzy-match/SentenceAlignment.h index 5aece3136..2ba6e2458 100644 --- a/moses/src/tm-mt/SentenceAlignment.h +++ b/moses/src/fuzzy-match/SentenceAlignment.h @@ -11,7 +11,7 @@ #include #include -#include "tm-mt/Vocabulary.h" +#include "fuzzy-match/Vocabulary.h" namespace tmmt { diff --git a/moses/src/tm-mt/SuffixArray.cpp b/moses/src/fuzzy-match/SuffixArray.cpp similarity index 100% rename from moses/src/tm-mt/SuffixArray.cpp rename to moses/src/fuzzy-match/SuffixArray.cpp diff --git a/moses/src/tm-mt/SuffixArray.h b/moses/src/fuzzy-match/SuffixArray.h similarity index 100% rename from moses/src/tm-mt/SuffixArray.h rename to moses/src/fuzzy-match/SuffixArray.h diff --git a/moses/src/tm-mt/TMMTWrapper.cpp b/moses/src/fuzzy-match/TMMTWrapper.cpp similarity index 98% rename from moses/src/tm-mt/TMMTWrapper.cpp rename to moses/src/fuzzy-match/TMMTWrapper.cpp index b05cd45c1..e49a37a39 100644 --- a/moses/src/tm-mt/TMMTWrapper.cpp +++ b/moses/src/fuzzy-match/TMMTWrapper.cpp @@ -7,10 +7,10 @@ // #include -#include "tm-mt/TMMTWrapper.h" -#include "tm-mt/SentenceAlignment.h" -#include "tm-mt/Vocabulary.h" -#include "tm-mt/Match.h" +#include "fuzzy-match/TMMTWrapper.h" +#include "fuzzy-match/SentenceAlignment.h" +#include "fuzzy-match/Vocabulary.h" +#include "fuzzy-match/Match.h" #include "Util.h" #include "StaticData.h" @@ -52,13 +52,19 @@ namespace tmmt string cmd = string("perl "); #ifdef IS_XCODE - cmd += "/Users/hieuhoang/unison/workspace/github/hieuhoang/contrib/tm-mt-integration/create_xml.perl " + tmExtractFile; + cmd += "/Users/hieuhoang/unison/workspace/github/hieuhoang/scripts/fuzzy-match/create_xml.perl " + tmExtractFile; #else - cmd += staticData.GetBinDirectory() + "../contrib/tm-mt-integration/create_xml.perl " + tmExtractFile; + cmd += staticData.GetBinDirectory() + "/../scripts/fuzzy-match/create_xml.perl " + tmExtractFile; #endif cerr << cmd << endl; system(cmd.c_str()); + remove(tmExtractFile.c_str()); + remove((tmExtractFile + ".extract").c_str()); + remove((tmExtractFile + ".extract.inv").c_str()); + remove((tmExtractFile + ".extract.sorted.gz").c_str()); + remove((tmExtractFile + ".extract.inv.sorted.gz").c_str()); + return tmExtractFile + ".pt.gz"; } diff --git a/moses/src/tm-mt/TMMTWrapper.h b/moses/src/fuzzy-match/TMMTWrapper.h similarity index 95% rename from moses/src/tm-mt/TMMTWrapper.h rename to moses/src/fuzzy-match/TMMTWrapper.h index 06f6737f2..318b6f8f7 100644 --- a/moses/src/tm-mt/TMMTWrapper.h +++ b/moses/src/fuzzy-match/TMMTWrapper.h @@ -11,9 +11,9 @@ #include #include -#include "tm-mt/SuffixArray.h" -#include "tm-mt/Vocabulary.h" -#include "tm-mt/Match.h" +#include "fuzzy-match/SuffixArray.h" +#include "fuzzy-match/Vocabulary.h" +#include "fuzzy-match/Match.h" namespace tmmt { diff --git a/moses/src/tm-mt/Vocabulary.cpp b/moses/src/fuzzy-match/Vocabulary.cpp similarity index 100% rename from moses/src/tm-mt/Vocabulary.cpp rename to moses/src/fuzzy-match/Vocabulary.cpp diff --git a/moses/src/tm-mt/Vocabulary.h b/moses/src/fuzzy-match/Vocabulary.h similarity index 100% rename from moses/src/tm-mt/Vocabulary.h rename to moses/src/fuzzy-match/Vocabulary.h diff --git a/moses/src/tm-mt/Jamfile b/moses/src/tm-mt/Jamfile deleted file mode 100644 index 2317e6947..000000000 --- a/moses/src/tm-mt/Jamfile +++ /dev/null @@ -1 +0,0 @@ -lib tm-mt : [ glob *.cpp ] ..//moses_internal ; diff --git a/contrib/tm-mt-integration/create_xml.perl b/scripts/fuzzy-match/create_xml.perl similarity index 100% rename from contrib/tm-mt-integration/create_xml.perl rename to scripts/fuzzy-match/create_xml.perl