X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FDomainLengths.java;h=5bb71cfef62397e027e3a2b37e6cbdad61b6e307;hb=4e1878f8b3c7dbff20ae4cd834b0ffd917f3ad72;hp=9e39b9e8d0af50e83e63a9b4b43b33ed444060ed;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/DomainLengths.java b/forester/java/src/org/forester/surfacing/DomainLengths.java
index 9e39b9e..5bb71cf 100644
--- a/forester/java/src/org/forester/surfacing/DomainLengths.java
+++ b/forester/java/src/org/forester/surfacing/DomainLengths.java
@@ -6,7 +6,7 @@
 // Copyright (C) 2008-2010 Christian M. Zmasek
 // Copyright (C) 2008-2010 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
@@ -16,13 +16,13 @@
 // 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
 //
 // Contact: phylosoft @ gmail . com
-// WWW: www.phylosoft.org/forester
+// WWW: https://sites.google.com/site/cmzmasek/home/software/forester
 
 package org.forester.surfacing;
 
@@ -31,15 +31,16 @@ import java.util.List;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.forester.species.Species;
 import org.forester.util.BasicDescriptiveStatistics;
 import org.forester.util.DescriptiveStatistics;
 
 public class DomainLengths {
 
-    final DomainId                                  _domain_id;
+    final String                                    _domain_id;
     final SortedMap<Species, DescriptiveStatistics> _length_statistics;
 
-    public DomainLengths( final DomainId domain_id ) {
+    public DomainLengths( final String domain_id ) {
         _domain_id = domain_id;
         _length_statistics = new TreeMap<Species, DescriptiveStatistics>();
     }
@@ -51,13 +52,6 @@ public class DomainLengths {
         getLengthStatistic( species ).addValue( domain_length );
     }
 
-    private void addLengthStatistics( final Species species, final DescriptiveStatistics length_statistic ) {
-        if ( getLengthStatistics().containsKey( species ) ) {
-            throw new IllegalArgumentException( "length statistics for [" + species.getSpeciesId() + "] already added" );
-        }
-        getLengthStatistics().put( species, length_statistic );
-    }
-
     /**
      * Returns descriptive statistics based on the arithmetic means
      * for each species.  
@@ -89,7 +83,7 @@ public class DomainLengths {
         return ( species_mean - population_mean ) / population_sd;
     }
 
-    public DomainId getDomainId() {
+    public String getDomainId() {
         return _domain_id;
     }
 
@@ -97,10 +91,6 @@ public class DomainLengths {
         return getLengthStatistics().get( species );
     }
 
-    private SortedMap<Species, DescriptiveStatistics> getLengthStatistics() {
-        return _length_statistics;
-    }
-
     public List<DescriptiveStatistics> getLengthStatisticsList() {
         final List<DescriptiveStatistics> list = new ArrayList<DescriptiveStatistics>();
         for( final DescriptiveStatistics stats : _length_statistics.values() ) {
@@ -140,4 +130,15 @@ public class DomainLengths {
     public boolean isHasLengthStatistic( final Species species ) {
         return getLengthStatistics().containsKey( species );
     }
+
+    private void addLengthStatistics( final Species species, final DescriptiveStatistics length_statistic ) {
+        if ( getLengthStatistics().containsKey( species ) ) {
+            throw new IllegalArgumentException( "length statistics for [" + species.getSpeciesId() + "] already added" );
+        }
+        getLengthStatistics().put( species, length_statistic );
+    }
+
+    private SortedMap<Species, DescriptiveStatistics> getLengthStatistics() {
+        return _length_statistics;
+    }
 }