Commit Graph

17 Commits

Author SHA1 Message Date
Ulrich Germann
40ed3df9cb Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
	moses/ChartParser.cpp
	moses/ChartParser.h
	moses/ConfusionNet.h
	moses/FF/CountNonTerms.cpp
	moses/FF/CountNonTerms.h
	moses/FF/SoftSourceSyntacticConstraintsFeature.cpp
	moses/FF/SoftSourceSyntacticConstraintsFeature.h
	moses/FF/SourceGHKMTreeInputMatchFeature.cpp
	moses/FF/SourceGHKMTreeInputMatchFeature.h
	moses/ForestInput.cpp
	moses/InputType.h
	moses/MockHypothesis.cpp
	moses/Sentence.cpp
	moses/Sentence.h
	moses/StaticData.cpp
	moses/StaticData.h
	moses/Syntax/F2S/GlueRuleSynthesizer.h
	moses/Syntax/T2S/GlueRuleSynthesizer.cpp
	moses/Syntax/T2S/GlueRuleSynthesizer.h
	moses/TreeInput.cpp
	moses/XmlOption.cpp
	moses/XmlOption.h
2015-12-11 01:59:26 +00:00
Ulrich Germann
29694af6e4 Code cleanup and refactoring. 2015-12-11 01:09:22 +00:00
Ulrich Germann
831dc83778 Code cleanup and refactoring. 2015-12-10 03:17:36 +00:00
Hieu Hoang
4078c30a42 estimatedScore -> estimatedScores 2015-11-04 15:10:45 +00:00
Hieu Hoang
6be932c1f7 consistent naming of future scores, estimated scores 2015-11-03 09:41:59 +00:00
Hieu Hoang
05ead45e71 beautify 2015-01-14 11:07:42 +00:00
Marcin Junczys-Dowmunt
18691c19a3 second attempt at new feature hook, needs review of constness etc. 2015-01-06 13:56:13 +01:00
Marcin Junczys-Dowmunt
f932058af4 Added new feature function hook: EvaluateWithSourceContextCollecton(...) 2015-01-06 10:46:31 +01:00
Nicola Bertoldi
e4eb201c52 merged master into dynamic-models and solved conflicts 2014-12-13 12:52:47 +01:00
Hieu Hoang
e197b110fc rename Evaluate() to EvaluateWhenApplied() 2014-07-09 23:54:16 +01:00
Hieu Hoang
12a14221e2 rename Evaluate() to EvaluateWhenApplied() 2014-07-09 23:41:08 +01:00
Hieu Hoang
587b5fd716 rename Evaluate() to EvaluateWithSourceContext() 2014-07-09 23:06:54 +01:00
Hieu Hoang
c9bd98fb0f rename Evaluate() to EvaluateInIsolation() 2014-07-09 22:35:59 +01:00
Nicola Bertoldi
4d75c889f1 merged master into dynamic-models 2014-06-08 09:39:37 +02:00
Nicola Bertoldi
2f3cd5e2fe beautify 2014-05-19 15:34:27 +02:00
Hieu Hoang
15566f7fc5 extend FF framework by add StackVec* argument to 2nd Evaluate(). NULL if phrase-based 2014-05-08 17:51:45 +01:00
Hieu Hoang
4c634023ce add FF CountNonTerms 2014-04-08 17:19:26 +01:00