inprogress

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 3677eb0..05b6c3b 100644 (file)
Binary files a/forester_applications/src/org/forester/applications/subtree_feature_count.class and b/forester_applications/src/org/forester/applications/subtree_feature_count.class differ

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 (file)
--- 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 );
         }
     }