Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/moses-smt/mosesdecoder.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHieu Hoang <s0565741@odin.inf.ed.ac.uk>2014-04-23 19:11:09 +0400
committerHieu Hoang <s0565741@odin.inf.ed.ac.uk>2014-04-23 19:11:09 +0400
commit2c14b506b450bcdcbb903158137a51185808211f (patch)
treef1ed61bb866a962f5a79db745ee1e658068e3a56 /moses/ChartTranslationOptionList.cpp
parent6a9eb6c848f12711b0a7ac2994fe06bf6491fd23 (diff)
merge problem
Diffstat (limited to 'moses/ChartTranslationOptionList.cpp')
-rw-r--r--moses/ChartTranslationOptionList.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/moses/ChartTranslationOptionList.cpp b/moses/ChartTranslationOptionList.cpp
index b86312b9d..89955dcee 100644
--- a/moses/ChartTranslationOptionList.cpp
+++ b/moses/ChartTranslationOptionList.cpp
@@ -163,15 +163,9 @@ float ChartTranslationOptionList::GetBestScore(const ChartCellLabel *chartCell)
{
const HypoList *stack = chartCell->GetStack().cube;
assert(stack);
- //assert(!stack->empty());
- if (stack->empty()) {
- return 0;
- }
- else {
- const ChartHypothesis &bestHypo = **(stack->begin());
- return bestHypo.GetTotalScore();
- } const ChartHypothesis &bestHypo = **(stack->begin());
- return bestHypo.GetTotalScore();
+ assert(!stack->empty());
+ const ChartHypothesis &bestHypo = **(stack->begin());
+ return bestHypo.GetTotalScore();
}
void ChartTranslationOptionList::Evaluate(const InputType &input, const InputPath &inputPath)