diff options
| author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
| commit | 9ff43d7c8e076aaa8790bacbd4b2cfe636a55a97 (patch) | |
| tree | e1e0265b18ffc854f24209cb36b2c836100f099b /extractor/translation_table.cc | |
| parent | e59cdac5253df7ab57296d347245d1a8f4d8b287 (diff) | |
| parent | 407b100cd3e4ae987504b53101151fba287ad999 (diff) | |
fix merge conflict
Diffstat (limited to 'extractor/translation_table.cc')
| -rw-r--r-- | extractor/translation_table.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/extractor/translation_table.cc b/extractor/translation_table.cc index 1b1ba112..11e29e1e 100644 --- a/extractor/translation_table.cc +++ b/extractor/translation_table.cc @@ -90,13 +90,12 @@ void TranslationTable::IncrementLinksCount( double TranslationTable::GetTargetGivenSourceScore( const string& source_word, const string& target_word) { - if (!source_data_array->HasWord(source_word) || - !target_data_array->HasWord(target_word)) { + int source_id = source_data_array->GetWordId(source_word); + int target_id = target_data_array->GetWordId(target_word); + if (source_id == -1 || target_id == -1) { return -1; } - int source_id = source_data_array->GetWordId(source_word); - int target_id = target_data_array->GetWordId(target_word); auto entry = make_pair(source_id, target_id); auto it = translation_probabilities.find(entry); if (it == translation_probabilities.end()) { @@ -107,13 +106,12 @@ double TranslationTable::GetTargetGivenSourceScore( double TranslationTable::GetSourceGivenTargetScore( const string& source_word, const string& target_word) { - if (!source_data_array->HasWord(source_word) || - !target_data_array->HasWord(target_word)) { + int source_id = source_data_array->GetWordId(source_word); + int target_id = target_data_array->GetWordId(target_word); + if (source_id == -1 || target_id == -1) { return -1; } - int source_id = source_data_array->GetWordId(source_word); - int target_id = target_data_array->GetWordId(target_word); auto entry = make_pair(source_id, target_id); auto it = translation_probabilities.find(entry); if (it == translation_probabilities.end()) { |