X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fmsa_compactor.java;h=e60d88697c79b236184bc2b4b04553cc5262221e;hb=154955274422ff0b34ff51fb40c2d621269368ca;hp=15c2d4c7e164cd1284fb9c41309bfd89d64a06bb;hpb=02bf2b081aed88622e3279e816f0aeb45cba546e;p=jalview.git diff --git a/forester/java/src/org/forester/application/msa_compactor.java b/forester/java/src/org/forester/application/msa_compactor.java index 15c2d4c..e60d886 100644 --- a/forester/java/src/org/forester/application/msa_compactor.java +++ b/forester/java/src/org/forester/application/msa_compactor.java @@ -394,6 +394,9 @@ public class msa_compactor { msa_props = mc.chart( step, realign, norm ); } Chart.display( msa_props, initial_number_of_seqs, report_entropy, in.getName() ); + System.out.println(); + System.out.println( "Final MSA properties" ); + printMsaInfo( msa, MsaMethods.calculateEffectiveLengthStatistics( msa )); } } catch ( final IllegalArgumentException iae ) { @@ -418,20 +421,24 @@ public class msa_compactor { WWW, ForesterUtil.getForesterLibraryInformation() ); System.out.println( "Input MSA : " + in ); - System.out.println( " MSA length : " + msa.getLength() ); - System.out.println( " Number of sequences : " + msa.getNumberOfSequences() ); - System.out.println( " Median sequence length : " + NF_1.format( initial_msa_stats.median() ) ); - System.out.println( " Mean sequence length : " - + NF_1.format( initial_msa_stats.arithmeticMean() ) ); - System.out.println( " Max sequence length : " + ( ( int ) initial_msa_stats.getMax() ) ); - System.out.println( " Min sequence length : " + ( ( int ) initial_msa_stats.getMin() ) ); - System.out.println( " Gap ratio : " + printMsaInfo( msa, initial_msa_stats ); + } + + private static void printMsaInfo( DeleteableMsa msa, final DescriptiveStatistics msa_stats ) { + System.out.println( "MSA length : " + msa.getLength() ); + System.out.println( "Number of sequences : " + msa.getNumberOfSequences() ); + System.out.println( "Median sequence length : " + NF_1.format( msa_stats.median() ) ); + System.out.println( "Mean sequence length : " + + NF_1.format( msa_stats.arithmeticMean() ) ); + System.out.println( "Max sequence length : " + ( ( int ) msa_stats.getMax() ) ); + System.out.println( "Min sequence length : " + ( ( int ) msa_stats.getMin() ) ); + System.out.println( "Gap ratio : " + NF_4.format( MsaMethods.calcGapRatio( msa ) ) ); - System.out.println( " Mean gap count per 100 residues : " - + NF_1.format( MsaMethods.calcNumberOfGapsPer100Stats( msa ).arithmeticMean() ) ); - System.out.println( " Normalized Shannon Entropy (entn7) : " + System.out.println( "Mean gap count per sequence : " + + NF_1.format( MsaMethods.calcNumberOfGapsStats( msa ).arithmeticMean() ) ); + System.out.println( "Normalized Shannon Entropy (entn7) : " + NF_4.format( MsaMethods.calcNormalizedShannonsEntropy( 7, msa ) ) ); - System.out.println( " Normalized Shannon Entropy (entn21): " + System.out.println( "Normalized Shannon Entropy (entn21) : " + NF_4.format( MsaMethods.calcNormalizedShannonsEntropy( 21, msa ) ) ); }