X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Futil%2FBasicDescriptiveStatistics.java;h=4d73ffb9675fdcafb6d4fd9a1b7c3785ed8ea370;hb=de8fbefc959f11af246340c4f903fb2983a95d4d;hp=699526ff503fc084ff824a3be0203a024e15401b;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git

diff --git a/forester/java/src/org/forester/util/BasicDescriptiveStatistics.java b/forester/java/src/org/forester/util/BasicDescriptiveStatistics.java
index 699526f..4d73ffb 100644
--- a/forester/java/src/org/forester/util/BasicDescriptiveStatistics.java
+++ b/forester/java/src/org/forester/util/BasicDescriptiveStatistics.java
@@ -7,7 +7,7 @@
 // Copyright (C) 2008-2009 Christian M. Zmasek
 // Copyright (C) 2008-2009 Burnham Institute for Medical Research
 // All rights reserved
-// 
+//
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -17,7 +17,7 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 // Lesser General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
@@ -39,6 +39,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     private double       _max;
     private double       _sigma;
     private boolean      _recalc_sigma;
+    private String       _desc;
 
     public BasicDescriptiveStatistics() {
         init();
@@ -47,6 +48,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#addValue(double)
      */
+    @Override
     public void addValue( final double d ) {
         _recalc_sigma = true;
         _sum += d;
@@ -62,6 +64,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#arithmeticMean()
      */
+    @Override
     public double arithmeticMean() {
         validate();
         return getSum() / getN();
@@ -70,6 +73,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#asSummary()
      */
+    @Override
     public String asSummary() {
         if ( getN() > 1 ) {
             return arithmeticMean() + DescriptiveStatistics.PLUS_MINUS + sampleStandardDeviation() + " [" + getMin()
@@ -83,6 +87,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#coefficientOfVariation()
      */
+    @Override
     public double coefficientOfVariation() {
         validate();
         return ( sampleStandardDeviation() / arithmeticMean() );
@@ -91,6 +96,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getDataAsDoubleArray()
      */
+    @Override
     public double[] getDataAsDoubleArray() {
         validate();
         final double[] data_array = new double[ getN() ];
@@ -103,6 +109,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getMax()
      */
+    @Override
     public double getMax() {
         validate();
         return _max;
@@ -111,6 +118,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getMin()
      */
+    @Override
     public double getMin() {
         validate();
         return _min;
@@ -119,6 +127,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getN()
      */
+    @Override
     public int getN() {
         return _data.size();
     }
@@ -126,6 +135,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getSum()
      */
+    @Override
     public double getSum() {
         validate();
         return _sum;
@@ -134,6 +144,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getSummaryAsString()
      */
+    @Override
     public String getSummaryAsString() {
         validate();
         final double mean = arithmeticMean();
@@ -144,6 +155,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#getValue(int)
      */
+    @Override
     public double getValue( final int index ) {
         validate();
         return ( ( ( _data.get( index ) ) ).doubleValue() );
@@ -156,11 +168,13 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
         _max = -Double.MAX_VALUE;
         _sigma = 0.0;
         _recalc_sigma = true;
+        _desc = "";
     }
 
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#median()
      */
+    @Override
     public double median() {
         validate();
         double median = 0.0;
@@ -185,6 +199,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#midrange()
      */
+    @Override
     public double midrange() {
         validate();
         return ( _min + _max ) / 2.0;
@@ -193,6 +208,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#pearsonianSkewness()
      */
+    @Override
     public double pearsonianSkewness() {
         validate();
         final double mean = arithmeticMean();
@@ -204,6 +220,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#sampleStandardDeviation()
      */
+    @Override
     public double sampleStandardDeviation() {
         return Math.sqrt( sampleVariance() );
     }
@@ -211,6 +228,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#sampleStandardUnit(double)
      */
+    @Override
     public double sampleStandardUnit( final double value ) {
         validate();
         return BasicDescriptiveStatistics.sampleStandardUnit( value, arithmeticMean(), sampleStandardDeviation() );
@@ -219,6 +237,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#sampleVariance()
      */
+    @Override
     public double sampleVariance() {
         validate();
         if ( getN() < 2 ) {
@@ -230,6 +249,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#standardErrorOfMean()
      */
+    @Override
     public double standardErrorOfMean() {
         validate();
         return ( sampleStandardDeviation() / Math.sqrt( getN() ) );
@@ -238,6 +258,7 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     /* (non-Javadoc)
      * @see org.forester.util.DescriptiveStatisticsI#sumDeviations()
      */
+    @Override
     public double sumDeviations() {
         validate();
         if ( _recalc_sigma ) {
@@ -337,4 +358,19 @@ public class BasicDescriptiveStatistics implements DescriptiveStatistics {
     public static double sampleStandardUnit( final double value, final double mean, final double sd ) {
         return ( value - mean ) / sd;
     }
+
+    @Override
+    public List<Double> getData() {
+        return _data;
+    }
+
+    @Override
+    public void setDescription( final String desc ) {
+        _desc = desc;
+    }
+
+    @Override
+    public String getDescription() {
+        return _desc;
+    }
 }