Merge branch 'releases/Release_2_11_3_Branch'

[jalview.git] / src / jalview / datamodel / ContactRange.java

diff --git a/src/jalview/datamodel/ContactRange.java b/src/jalview/datamodel/ContactRange.java
index 0fb71cf..4ff87b6 100644 (file)
--- a/src/jalview/datamodel/ContactRange.java
+++ b/src/jalview/datamodel/ContactRange.java
@@ -1,6 +1,25 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.datamodel;
 
-
 /**
  * bean for max/min positions for a given range
  * 
@@ -19,6 +38,8 @@ public class ContactRange
 
   int from_column, to_column;
 
+  private double mean;
+
   /**
    * update the bean with given values
    * 
@@ -29,8 +50,8 @@ public class ContactRange
    * @param maxPos
    * @param max
    */
-  public void update(int from_column, int to_column, int minPos,
-          double min, int maxPos, double max)
+  public void update(int from_column, int to_column, int minPos, double min,
+          int maxPos, double max, double mean)
   {
     this.from_column = from_column;
     this.to_column = to_column;
@@ -38,6 +59,7 @@ public class ContactRange
     this.min = min;
     this.maxPos = maxPos;
     this.max = max;
+    this.mean = mean;
   }
 
   /**
@@ -109,6 +131,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()