moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-26 05:14:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge errors.

Browse Source
This commit is contained in:
Paul Baltescu 2014-11-13 16:52:24 +00:00
parent 2028b86642
commit fefd2b0ada
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
moses/FF/Factory.cpp
View File

@ -42,6 +42,7 @@
#include "moses/FF/SourceGHKMTreeInputMatchFeature.h" #include "moses/FF/SourceGHKMTreeInputMatchFeature.h"
#include "moses/FF/HyperParameterAsWeight.h" #include "moses/FF/HyperParameterAsWeight.h"
#include "moses/FF/SetSourcePhrase.h" #include "moses/FF/SetSourcePhrase.h"
#include "moses/FF/PhraseOrientationFeature.h"
#include "CountNonTerms.h" #include "CountNonTerms.h"
#include "ReferenceComparison.h" #include "ReferenceComparison.h"
#include "RuleScope.h" #include "RuleScope.h"
@ -49,12 +50,11 @@
#include "NieceTerminal.h" #include "NieceTerminal.h"
#include "SpanLength.h" #include "SpanLength.h"
#include "SyntaxRHS.h" #include "SyntaxRHS.h"
#include "moses/FF/PhraseOrientationFeature.h"
#include "bilingual-lm/BilingualLM.h"
#include "moses/FF/SkeletonStatelessFF.h" #include "moses/FF/SkeletonStatelessFF.h"
#include "moses/FF/SkeletonStatefulFF.h" #include "moses/FF/SkeletonStatefulFF.h"
#include "moses/LM/SkeletonLM.h" #include "moses/LM/SkeletonLM.h"
#include "moses/LM/BilingualLM.h"
#include "SkeletonChangeInput.h" #include "SkeletonChangeInput.h"
#include "moses/TranslationModel/SkeletonPT.h" #include "moses/TranslationModel/SkeletonPT.h"
#include "moses/Syntax/RuleTableFF.h" #include "moses/Syntax/RuleTableFF.h"
@ -218,7 +218,6 @@ FeatureRegistry::FeatureRegistry()
MOSES_FNAME(SpanLength); MOSES_FNAME(SpanLength);
MOSES_FNAME(SyntaxRHS); MOSES_FNAME(SyntaxRHS);
MOSES_FNAME(PhraseOrientationFeature); MOSES_FNAME(PhraseOrientationFeature);
MOSES_FNAME(BilingualLM);
MOSES_FNAME(SkeletonStatelessFF); MOSES_FNAME(SkeletonStatelessFF);
MOSES_FNAME(SkeletonStatefulFF); MOSES_FNAME(SkeletonStatefulFF);

9
moses/Jamfile
View File

@ -10,6 +10,15 @@ if $(with-dlib) {
dlib = ; dlib = ;
} }
with-oxlm = [ option.get "with-oxlm" ] ;
if $(with-oxlm) {
oxlm2 = <cxxflags>-std=c++0x <define>LM_OXLM <include>$(with-oxlm)/src
<include>$(with-oxlm)/third_party/eigen ;
} else {
oxlm2 = ;
}
alias headers : ../util//kenutil : : : $(max-factors) $(dlib) $(oxlm2) ;
alias ThreadPool : ThreadPool.cpp ; alias ThreadPool : ThreadPool.cpp ;
alias Util : Util.cpp Timer.cpp ; alias Util : Util.cpp Timer.cpp ;

2
moses/LM/oxlm/OxLM.h
View File

@ -24,8 +24,6 @@ class OxLM : public LanguageModelSingleFactor {
void Load(); void Load();
double GetScore(int word, const std::vector<int>& context) const;
virtual LMResult GetValue( virtual LMResult GetValue(
const std::vector<const Word*> &contextFactor, const std::vector<const Word*> &contextFactor,
State* finalState = 0) const; State* finalState = 0) const;