fix merge conflict

1 files changed, 8 insertions, 3 deletions

diff --git a/extractor/vocabulary.cc b/extractor/vocabulary.cc
index 15795d1e..c9c2d6f4 100644
--- a/extractor/vocabulary.cc
+++ b/extractor/vocabulary.cc
@@ -8,12 +8,13 @@ int Vocabulary::GetTerminalIndex(const string& word) {
   int word_id = -1;
   #pragma omp critical (vocabulary)
   {
-    if (!dictionary.count(word)) {
+    auto it = dictionary.find(word);
+    if (it != dictionary.end()) {
+      word_id = it->second;
+    } else {
       word_id = words.size();
       dictionary[word] = word_id;
       words.push_back(word);
-    } else {
-      word_id = dictionary[word];
     }
   }
   return word_id;
@@ -34,4 +35,8 @@ string Vocabulary::GetTerminalValue(int symbol) {
   return word;
 }
 
+bool Vocabulary::operator==(const Vocabulary& other) const {
+  return words == other.words && dictionary == other.dictionary;
+}
+
 } // namespace extractor