From 050fac2901de2508b5a32b2785c710bff56a728d Mon Sep 17 00:00:00 2001
From: "cmzmasek@gmail.com"
 <cmzmasek@gmail.com@ca865154-3058-d1c3-3e42-d8f55a55bdbd>
Date: Thu, 21 Nov 2013 03:23:44 +0000
Subject: [PATCH] inprogress

---
 .../org/forester/applications/subtree_feature_count.class  |  Bin 4719 -> 4940 bytes
 .../org/forester/applications/subtree_feature_count.java   |   12 +++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/forester_applications/src/org/forester/applications/subtree_feature_count.class b/forester_applications/src/org/forester/applications/subtree_feature_count.class
index 3677eb08f4b092b39d54e8e20e370e885871061c..05b6c3badbc7970cdb13a41b21c2bd7ec9f11d11 100644
GIT binary patch
delta 1620
zcmZvcc~n$Y9LGO*w)^IBVaB0336%$pl<XMic#fK+sR)@`niVOMDFTAXGUAeDGMXi=
zw!GZhwZ$y0#KJ+#$}H1pQ=@&~Y_+mY1nFMzoF?u4@%`QJ_x|2*x%c<pf%K-H(cMS3
zYy<j=pw0PIOCmNdW?Ix3JIi9W&1mM>%;gHnJR3jN7FQ;48dn*Q`8HRxz@k<XwF#Qd
zg~l#2aE;Akt~GAgSu8P1ogvrT+`x@CH*s?`fm>K=Qrs%J&88c-8@R*9;ZBoeSpv&h
zVPK_XmE<m)p4@G75BD0l&*pv}FlkmNu!d!l2W|TBkj2BMutyA8Yw@VXI*Z3F9yc-9
z`-bN0p7mpo)o*Svo=;djY3x&e-RVY~dNx@+ZSjmngT-cxm`T!TV2j08<M6D-bH;8n
z@Vw*&$%{^wIGh;isC2vJCEb&g?dliYA$eKXE_p?=Q`hL!xz2J=Am7>UIwNfYlLVf!
zl8T7pRdxwPnWBPx$!^7KG&zaxlapWP4aJ+hCE2ccn>~WC6Y++faqhn1z3fxGL$l;v
z#e2N3_<#?cmF_;1_wteAV?L35s`!l0C0{7M<SWV7if{N<QA~*-xx8?0VP-{PRcU7K
zyrPoG?CI52iv8p(zB6IJSNy<_il6vdvO{rzUlhOco0IOzN;}B!l0OuG8u2gw)=er7
z(V{p^t8Uk+_4H0|qgmjN6i-zgVV9zvW@oFXTe^TfN(kXn!Yw?yb-!77mGB8Eg{6dF
z*v>&u(TNE(E1^W9K<3RVEG@}OQzA(OoJ#Lt%P#`jk^D{d-YQ>`x2AedRk6UEku&o2
z9H*N~cZV}_oJ<+sl&$)S=x9CX=rK;^0>&U1tC@=g%`c4O*_w}w;~vc~isL@bFOK8G
zG`}Q{579g?jt4Zq)bO!K6AsnF_&A5*cyuv(CNxgeC7q(JJ{`QhHzPLcg`hyAuR~1L
z^<Ty$y`JdgChZdiPHLcF{N;K-9bYTmC6j$^^pi}H6t>dK-LA)8NTwPnO4O<Ky_>gn
z>-%-$E;{^%-o0XUAJeCi9)c`Sil>oN1*^mgrzx;An&NGwzo5VW1O|kCbu+^Lx@u31
zfdg$L$T&e6!HN@-wi3+WOqZ-+N-*q?k<~!*_>^Gi>`oi@9WTjarGjACI#vsIwPOtW
zZ?LZFcq!?qRL|g)U<2o@JyK%M)75dFYshfgf_c$HOc6GP;v}Yubc#eK#bSW|HnN!}
zMo}vAC=-*IF3Knu5oU<_REWh?iltPE<y4E+M8rB~iuKfB?qLyj8%Z4(Fs+?l_$8(8
zPO4E)ykr{sGsq^<>_m^*l9WlNOUgUkS{Wpn;R>`6XxDZBf2<Z<?KGj2bR^O>*yb<N
zdCR(2sTIf!1wunYLqo$t*`eVva$@A_a|w+&w}BC6ab5!>wQXQjC;mHmse1Nc4k7)Q
WOl1K*s3n6aXR=V|sMLEds{R24v`5qc

delta 1400
zcmZvcc~I3=6vsdJy~n%1_v6BQJclNj#*kPV8ft2WM8qZ6GEpmEWLOA_P?(WhWy{Mp
z%U1feX}c{}wkh=lHCwDKL#2}Tecx@*5TtX#Ki-V~^F8xD=lsq&-*fN%wHNHli*Mb#
zeiLwv(k{o-sF~y9;~a;%)}HIo<T9S~T;?%fv%n=pqr<{f@>ygv&Ud+h3mq0~E^>+3
z;KkNnV&PJkIG5S9B@UNc&lQ$j>2eiUyDa6Jcq-Sj%(l2rbG^$zZm@8p%T3&Dn>43#
z3!a5rHMePQcPZcwmpfT*VTH?G+-=+3lghm`YwmL?=6;6<>|iS`dC=h@hld>=aad(*
zK59dcIXoVsd>*S^p5RG`ryQPkc*bFk!&+Oh#lo`=&)I~8!#ZnQEwpLYYc_ZlYERmn
zzOgoHo)-aL%vTcGq<KLG)x4;ANe1#(_)7g#iFuvABXXuPO%Z6Qo6}@?nav8-U}zww
zdByN5uX#ECLn2#v-S7rmH5(0Y((X<4PsrTHcEb)jG;bN+<{iUMI=$8Y;{0vAYj}_M
zH6Iv0<Ri_;hEMoZ^O@muzA((7#_RDPockp)!&kP(*M@KS*6<zQYc?5v;77wx{Ok=5
zl;!-wubN$k->ma@{tzjKKl#h>H~)wzuQ^aO;9oiv{-#;AhTUv7{6~kkJuonvF4_%y
z=oW1uLl1j3y+(-gA}KSoeRLS*R{@2N&9AAiE6Xt|MFkb5-eiBKw=yN)K?NnBSj&!-
zxk0bO<hCp|B`Q8%E+}&UvN?eXC{7gSBUSjsBtBetMG_APpOnOd!Y3#3VZx^*@u9*`
zO5$PRCtIGkuVJ}3PDx4_K|qF)^A$YRt4=>Cvr+~N3PUnOoW``i$g=dEs?w_tS5=-a
zkvxLk4AN8udnnON*PPK!p}$wIr_!8hp*l^zmy@$!i_$6h34<C|RM^U(NyTmCD#`*`
zfi@0PELVkIMr2ET1CeR#$S4bCg|brGI9Ach-~<CIvqI6*ew!KG-=+6=Is05|8Il!B
zP_}As=bFBaTX~D+k-}(^IYy+6rI2wH$t(7@WQ>gOW`>BbQK{6b0nAhbnWYM-Q%5sf
z4WV9@%Z0Z)Sc2O_dY|~(UMUgM%=GtDL8W8|wb08b(hd;O%+l0pX7^=vQ?9A^g}VsH
zd*xajxK<awUZx{W`Wnd$u6=y{8>R{^9ylr*jt-5MM~6j+M@O_WvX$dx3DHprMq4{3
r!C0{g#`UA!io$LsTlN8mHWHQJWj6E4WdVn?kRw?nDQ8L0$Jze_(18~Y

diff --git a/forester_applications/src/org/forester/applications/subtree_feature_count.java b/forester_applications/src/org/forester/applications/subtree_feature_count.java
index 4326166..60c4b16 100644
--- a/forester_applications/src/org/forester/applications/subtree_feature_count.java
+++ b/forester_applications/src/org/forester/applications/subtree_feature_count.java
@@ -91,14 +91,24 @@ public class subtree_feature_count {
                     }
                 }
             }
+            final int n = l.size();
+            final double xray_p = ForesterUtil.round( 100.0 * xray / n, 1 );
+            final double nmr_p = ForesterUtil.round( 100.0 * nmr / n, 1 );
+            final double model_p = ForesterUtil.round( 100.0 * model / n, 1 );
             final StringBuilder sb = new StringBuilder();
-            sb.append( String.valueOf( l.size() ) );
+            sb.append( String.valueOf( n ) );
             sb.append( "\t" );
             sb.append( String.valueOf( xray ) );
             sb.append( "\t" );
             sb.append( String.valueOf( nmr ) );
             sb.append( "\t" );
             sb.append( String.valueOf( model ) );
+            sb.append( "\t" );
+            sb.append( String.valueOf( xray_p ) );
+            sb.append( "\t" );
+            sb.append( String.valueOf( nmr_p ) );
+            sb.append( "\t" );
+            sb.append( String.valueOf( model_p ) );
             System.out.println( sb );
         }
     }
-- 
1.7.10.2