JAL-2349 bean holds mean and max for a range

diff --git a/src/jalview/datamodel/ContactRange.java b/src/jalview/datamodel/ContactRange.java
index 0fb71cf..5de8b04 100644 (file)
--- a/src/jalview/datamodel/ContactRange.java
+++ b/src/jalview/datamodel/ContactRange.java
@@ -19,6 +19,8 @@ public class ContactRange
 
   int from_column, to_column;
 
+  private double mean;
+
   /**
    * update the bean with given values
    * 
@@ -30,7 +32,7 @@ public class ContactRange
    * @param max
    */
   public void update(int from_column, int to_column, int minPos,
-          double min, int maxPos, double max)
+          double min, int maxPos, double max, double mean)
   {
     this.from_column = from_column;
     this.to_column = to_column;
@@ -38,6 +40,7 @@ public class ContactRange
     this.min = min;
     this.maxPos = maxPos;
     this.max = max;
+    this.mean = mean;
   }
 
   /**
@@ -109,6 +112,23 @@ public class ContactRange
   }
 
   /**
+   * @return the mean
+   */
+  public double getMean()
+  {
+    return mean;
+  }
+
+  /**
+   * @param mean
+   *          the mean to set
+   */
+  public void setMean(double mean)
+  {
+    this.mean = mean;
+  }
+
+  /**
    * @return the from_column
    */
   public int getFrom_column()

diff --git a/test/jalview/datamodel/ContactRangeTest.java b/test/jalview/datamodel/ContactRangeTest.java
index a0242a7..431834c 100644 (file)
--- a/test/jalview/datamodel/ContactRangeTest.java
+++ b/test/jalview/datamodel/ContactRangeTest.java
@@ -9,13 +9,14 @@ public class ContactRangeTest {
   public void testContactRangeBean()
   {
     ContactRange cr = new ContactRange();
-    cr.update(5, 15, 6, 0.2, 12, 1.5);
+    cr.update(5, 15, 6, 0.2, 12, 1.5,3.7);
     Assert.assertEquals(5, cr.getFrom_column());
     Assert.assertEquals(15, cr.getTo_column());
     Assert.assertEquals(6, cr.getMinPos());
     Assert.assertEquals(0.2, cr.getMin());
     Assert.assertEquals(12, cr.getMaxPos());
     Assert.assertEquals(1.5, cr.getMax());
+    Assert.assertEquals(3.7, cr.getMean());
     cr.setFrom_column(6);
     Assert.assertEquals(6, cr.getFrom_column());
     cr.setTo_column(16);
@@ -28,5 +29,7 @@ public class ContactRangeTest {
     Assert.assertEquals(13, cr.getMaxPos());
     cr.setMax(2.5);
     Assert.assertEquals(2.5, cr.getMax());
+    cr.setMean(3.7);
+    Assert.assertEquals(3.7, cr.getMean());
   }
 }