From 09ea6e231c045fd6273915d1d12265d9be50222c Mon Sep 17 00:00:00 2001
From: mjdenkowski <michael.j.denkowski@gmail.com>
Date: Thu, 10 Apr 2014 16:58:46 -0400
Subject: Refactoring

---
 python/cdec/sa/features.py | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'python/cdec/sa/features.py')

diff --git a/python/cdec/sa/features.py b/python/cdec/sa/features.py
index e19a18c0..92e23889 100644
--- a/python/cdec/sa/features.py
+++ b/python/cdec/sa/features.py
@@ -3,6 +3,8 @@ import math
 
 from cdec.sa import isvar
 
+from online import get_score_multilex
+
 MAXSCORE = 99
 
 def EgivenF(ctx): # p(e|f) = c(e, f)/c(f)
@@ -40,21 +42,6 @@ def CoherenceProb(ctx): # c(f) / sample c(f)
         prob = (ctx.fcount + ctx.online.fcount) / (ctx.fsample_count + ctx.online.fsample_count)
     return -math.log10(prob)
 
-# Not a feature, used for MaxLex
-# bilex get_score for multiple instances
-def get_lex_online(f, e, dir, bilex_list):
-    num = 0
-    denom = 0
-    for bilex in bilex_list:
-        if dir == 0:
-            denom += bilex.f.get(f, 0)
-        else:
-            denom += bilex.e.get(e, 0)
-        num += bilex.fe.get((f, e), 0)
-    if (not num) or (not denom):
-        return None
-    return num / denom
-
 def MaxLexEgivenF(ttable):
     def MaxLexEgivenF(ctx):
         fwords = ctx.fphrase.words
@@ -62,7 +49,7 @@ def MaxLexEgivenF(ttable):
         maxOffScore = 0.0
         for e in ctx.ephrase.words:
             if ctx.online:
-                maxScore = max(get_lex_online(f, e, 0, (ttable, ctx.online.bilex)) for f in fwords)
+                maxScore = max(get_score_multilex(f, e, 0, (ttable, ctx.online.bilex)) for f in fwords)
             else:
                 maxScore = max(ttable.get_score(f, e, 0) for f in fwords)
             maxOffScore += -math.log10(maxScore) if maxScore > 0 else MAXSCORE
@@ -76,7 +63,7 @@ def MaxLexFgivenE(ttable):
         maxOffScore = 0.0
         for f in ctx.fphrase.words:
             if ctx.online:
-                maxScore = max(get_lex_online(f, e, 1, (ttable, ctx.online.bilex)) for e in ewords)
+                maxScore = max(get_score_multilex(f, e, 1, (ttable, ctx.online.bilex)) for e in ewords)
             else:
                 maxScore = max(ttable.get_score(f, e, 1) for e in ewords)
             maxOffScore += -math.log10(maxScore) if maxScore > 0 else MAXSCORE
-- 
cgit v1.2.3