From c3c4a39ccea71670b98144d6a87f0811db68cf63 Mon Sep 17 00:00:00 2001
From: Kevin Brubeck Unhammer <pixiemotion@gmail.com>
Date: Wed, 3 Sep 2008 15:41:33 +0200
Subject: [PATCH] before removing sum_hat_a from p_ATTACH

---
 src/loc_h_dmv.py  |  17 ++++++++++++++---
 src/loc_h_dmv.pyc | Bin 35564 -> 38039 bytes
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/loc_h_dmv.py b/src/loc_h_dmv.py
index a23fa9a..6f34f9b 100644
--- a/src/loc_h_dmv.py
+++ b/src/loc_h_dmv.py
@@ -750,9 +750,13 @@ def reest_head2(h, g, corpus, p_ROOT, p_STOP, p_ATTACH):
     def hat_d(xbar,x,xi,xj): return hat_d2(xbar,x,xi,xj, g, corpus)
     def hat_a(a, x, dir  ): return hat_a2(a, x, dir,   g, corpus)
     def div(num,den):
-#        return num # todo: test without division by sum_hat_a
+        if not ("0.0"=="%s"%den or "1.0"=="%s"%den):
+            print "in reest_head2:div, got den=%s"%den
+#         return num # todo: test without division by sum_hat_a
         if den > 0.0: return num / den
-        else: return den
+        else:
+            if num > 0.0: raise ValueError
+            return den
     
     p_STOP[h, LEFT,NON] = \
         hat_d((SEAL,h),(RGOL,h),xlt,  xgteq) + \
@@ -1101,7 +1105,7 @@ if __name__ == "__main__":
     pprint.pprint(q_tree)
     pprint.pprint(f_T_q)
     print sum([f for f in f_T_q.values()])
-
+    
     def treediv(num,den):
         return sum([f_T_q[i] for i in num ]) / \
         sum([f_T_q[i] for i in den ])
@@ -1129,6 +1133,13 @@ if __name__ == "__main__":
     vrtrees = (1,2,3,4,5,6,7,
                7,2)
     g2['v> --> v> _n_'] = treediv( (2,7), vrtrees )
+
+    g2[' v|n,R '] = treediv( (1,  2,  6),
+                             (1,1,2,3,6) )
+    g2[' n|n,R '] = treediv( (1,    3),
+                             (1,1,2,3,6) )
     
     pprint.pprint(g2)
+    g3 = reestimate2(g, ['n v n'.split()])
+    print g3
     
diff --git a/src/loc_h_dmv.pyc b/src/loc_h_dmv.pyc
index 1da9ac83ac205078b4fd030f2d74eda65e3991ea..e0854ad50e26afa173d07f6c61625cf9f3303345 100644
GIT binary patch
delta 2907
zcwVhl>u(fQ6hG(g1GaWsY*Q3cVWWVH7A-A(Z<ju4(eiK?M2E+=?o5{{Wy(GrG$|cI
z35D{(52KQ3OpJVzZ!-8uG-_hv2V=zO2NS<(NKA-N;ve8ScXryPR$LNxcFvshJHLDG
zz2}^{^XqHk(z~MGxfQM$u|FM7L-AKncMsk9dH;L$HNsMx;4FaB44MGd2NMFOMg?ly
zKyQIr0Mr`YM-xAkR?zMPtrgT}&^Ix16kyf|N*gOmJE+@0BiRBmwN+|uq_s<}gEZIM
zx!~;r%X7yF?3P*_VjQdkUW&4<ck(;~hu6X(0ZJDrG0^DW26b8oXk8G?ekcy804l<<
zZcr#jH|R3bEYiANqr)}gkOA;3+ZoV%IIcBtI1EZJXoU4bO}5&1a65B{hSlvdF@17p
z{h;-Mx*OCzFe^ao2ek)c4DAK=84v1pp#-Q&59)KFeW335pnlruv!D#fhzBgt20YJz
zOMb2d8g!xOOQ0PzUIArLjz0+6pywEJxra)iVd5SJWryS*0d0rp*y(apU@c-#5qT7p
zAxRzsZOC&x?UG*rHSIwoE~J90dC)F`++_E=$zFY1qhyeY$}nidlw5-dRIp?e$DPyS
z;;7}LmP~S6Qh~UXs(@*P)zpqBs)*_<1;PaQrR4@9O%1?=AEqkF0QS@+je4mU9Tk8D
zfHMe1ev%p{84c20yYoEtVB-^wc|pp?ytKEHxsIN?5y@#<zK}Yqjj2tYs%|z!GE;?!
zsu|rI<yz%0iX;-3?G5S9a0LVSFowk%@qm*~Hz8Iyud5vb*E`>ikNB|J-g>;&Zk!my
zmZG-V{$`>R+lp4m-gs;jJ4&o}`^RICVwWu@Kf!MMv&k&>kXOS#`_l27*x;NoMi7rU
z*QY*0%-QF&Z{du+DfcSQIv?l0_TvTT{K+@`c-eVm`kcV)_LZ3%c*B0h`W$aMdr!aY
z$KRc=&b}$I&K{q8+)kapQnkTPl?cj>tRnd0+y~a?MJR;Lm=BO<M9heh`Q=)*b?f^t
z<2olH^Y@kUxys2Kah<c7c}HA&awhmiT<4_feil4X=Rg^|@%^{=w_lCxE67SSpM4>^
z`?(VmB&cZo#-0)uO!FadKb-Qxw15J_v=7$QWUF9CaJzX#*%uzqzsPHa89(#tlCoC2
zqdZ+g=P7v7@zlOlHp*J!Bny+pV=RVPTm$>(UF$4fXMy^G+F(DY!!Oej#e5|_b5qn8
zTeid_DI>K6FjM(e1dv18$$fkFMvQpO1<exBB(Rzj8;^ORB+<pJm=~@DbTPvXAThIK
zuouw7%pxx=$9h9~#Y+&=Ma;N2j5t=F6A&?{jfO<T)eWi37fF_1R(-i*M_2qWMYe&g
zj;sA^g!Laos>%yp2IbD7th<YKuX(jrdBk!ki;g8_5(}6#eWhf}CEm+?hsxu*!U`;`
zFt8Az+?i_2<K2n!&~2P0#Gu`4*2>RViAUz}uJ*_jcZ<TqqRRyhEV~ZBw~+PA`@PXS
zowXNMqV*f;i9c8jK=B|<PikYi#0Z<r%%<|1Q7Ec>^d<gex;!ZPWGwhxk7S%Uk<*QW
zJXGn#EJiTLCSTO@i2{RvvG{>KD@hnFlevQYy0T?@25;FY(aoYRzbDO6uz%XM&Q|AZ
z@H_kDd?z;ASLe4JuMP!5fiPC!irNr9h(XdyuONn@5^Jy$!*n%>kS~a}bP+CZz(w2B
MZ+nU&Q-mq{Kg6K%=l}o!

delta 438
zcwQ}!KS*0q6voeY^P-Is(TcQUMCc$7RBRKCQGy8V&>@J#ElVtUSB)m`#Uu)qLeNwN
zGl(3eMJtY?wD{*P4we>IT^&n1lnx>mx^*acANIicosaLF%em*>zPQ;G0rkgUGdJ@2
zWs3esqs}3ng)wm)cqrmhkmaE%K~9(;LzM2JGHLbnzVx~!5hhtnGE7#G((SG@NmTYw
zqK|A4tPs7`L%n2yM$H~|U{uDMp?8eBdkl>?TAQvjY!d&K176{NMGcJyfhtv)=oe^F
zpVBc8y4lG_Ih>8)nO1WMX$H7tNBB#&#qZOvrjr>bWjmH+JKL%|N%Zk|`wad3!I?pn
z>v9r<T+Cg=RLPkbkWe4<r-03}xPy82%x<8h-p^hdSW<F+%fRkQX<6WcR~CNa2WJ+)
z;+N_wzcz5K_Exq98u<BY2X|JE(8k{?k2$@1*bvoc6{_4TP>&{<5p}ix08ehU5r3gk
p^lGFs@>M?m+x22D9%=9z2a)G<9zZAm<1T-l&+A7GsvCU>h&$L1b{+r#

-- 
2.11.4.GIT