Fixed usage of updated ScoredAnalysis.

Author: owo

camel_tools/disambig/bert/unfactored.py

@@ -468,7 +468,12 @@ def _scored_analyses(self, word_dd, prediction):
         if len(analyses) == 0:
             # If the word is not found in the analyzer,
             # return the predictions from BERT
-            return [ScoredAnalysis(0, bert_analysis)]
+            return [ScoredAnalysis(0,                      # score
+                                   bert_analysis,          # analysis
+                                   bert_analysis['diac'],  # diac
+                                   -99,                    # pos_lex_logprob
+                                   -99,                    # lex_logprob
+                                   )]
 
         scored = [(self._scorer(a,
                                 bert_analysis,

camel_tools/disambig/mle.py

@@ -188,8 +188,17 @@ def _scored_analyses(self, word_dd):
 
             max_score = max([s[0] for s in scored])
 
-            scored_analyses = [ScoredAnalysis(s[0] / max_score, s[1])
-                               for s in scored]
+            if max_score == 0:
+                max_score = 1
+
+            scored_analyses = [
+                ScoredAnalysis(
+                    s / max_score,                  # score
+                    a,                              # analysis
+                    a['diac'],                      # diac
+                    a.get('pos_lex_logprob', -99),  # pos_lex_logprob
+                    a.get('lex_logprob', -99),      # lex_logprob
+                ) for s, a in scored]
 
             return scored_analyses[0:self._top]
 
@@ -202,9 +211,6 @@ def _scored_analyses(self, word_dd):
             probabilities = [10 ** _get_pos_lex_logprob(a) for a in analyses]
             max_prob = max(probabilities)
 
-            scored_analyses = [ScoredAnalysis(p / max_prob, a)
-                               for a, p in zip(analyses, probabilities)]
-
             scored_analyses = [
                 ScoredAnalysis(
                     p / max_prob,                   # score