X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fmsa_compactor%2FMsaProperties.java;h=ae575b2054ebed6bc9ae8bf66c107e5e1665980c;hb=06b38f91bc061d8ab1dfea3b6238c94c95a30d26;hp=f24f60fe68aad62342ef1eaf6b08f2597925b53a;hpb=861cf1ba9d6eb76eeb499fa59d7ffc961e5288e1;p=jalview.git

diff --git a/forester/java/src/org/forester/msa_compactor/MsaProperties.java b/forester/java/src/org/forester/msa_compactor/MsaProperties.java
index f24f60f..ae575b2 100644
--- a/forester/java/src/org/forester/msa_compactor/MsaProperties.java
+++ b/forester/java/src/org/forester/msa_compactor/MsaProperties.java
@@ -29,7 +29,8 @@ import org.forester.msa.MsaMethods;
 
 public final class MsaProperties {
 
-    final private double _average_identity_ratio;
+    final private double _entropy21;
+    final private double _entropy7;
     final private double _gap_ratio;
     final private int    _length;
     final private int    _number_of_sequences;
@@ -38,30 +39,38 @@ public final class MsaProperties {
     public MsaProperties( final int number_of_sequences,
                           final int length,
                           final double gap_ratio,
-                          final double average_identity_ratio,
+                          final double entropy7,
+                          final double entropy21,
                           final String removed_seq ) {
         _number_of_sequences = number_of_sequences;
         _length = length;
         _gap_ratio = gap_ratio;
-        _average_identity_ratio = average_identity_ratio;
+        _entropy7 = entropy7;
+        _entropy21 = entropy21;
         _removed_seq = removed_seq;
     }
 
-    public MsaProperties( final Msa msa, final String removed_seq, final boolean calculate_aln_mean_identity ) {
+    public MsaProperties( final Msa msa, final String removed_seq, final boolean calculate_normalized_shannon_entropy ) {
         _number_of_sequences = msa.getNumberOfSequences();
         _length = msa.getLength();
         _gap_ratio = MsaMethods.calcGapRatio( msa );
         _removed_seq = removed_seq;
-        if ( calculate_aln_mean_identity ) {
-            _average_identity_ratio = MsaMethods.calculateIdentityRatio( 0, msa.getLength() - 1, msa ).arithmeticMean();
+        if ( calculate_normalized_shannon_entropy ) {
+            _entropy7 = MsaMethods.calcNormalizedShannonsEntropy( 7, msa );
+            _entropy21 = MsaMethods.calcNormalizedShannonsEntropy( 21, msa );
         }
         else {
-            _average_identity_ratio = -1;
+            _entropy7 = -1;
+            _entropy21 = -1;
         }
     }
 
-    public final double getAverageIdentityRatio() {
-        return _average_identity_ratio;
+    public final double getEntropy21() {
+        return _entropy21;
+    }
+
+    public final double getEntropy7() {
+        return _entropy7;
     }
 
     public final double getGapRatio() {