X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FDomainLengthsTable.java;h=44b62474e33e34a84063bb046e159a1a2789d348;hb=1cc7085032221eb6dea3ceeacc34ed710cf18318;hp=9a9e0a7d7c0f583e3aa91fc78b4214239dfc52f8;hpb=656be28debec520e0e35a8b311114398a40ea366;p=jalview.git diff --git a/forester/java/src/org/forester/surfacing/DomainLengthsTable.java b/forester/java/src/org/forester/surfacing/DomainLengthsTable.java index 9a9e0a7..44b6247 100644 --- a/forester/java/src/org/forester/surfacing/DomainLengthsTable.java +++ b/forester/java/src/org/forester/surfacing/DomainLengthsTable.java @@ -33,7 +33,6 @@ import java.util.SortedMap; import java.util.TreeMap; import org.forester.protein.Domain; -import org.forester.protein.DomainId; import org.forester.protein.Protein; import org.forester.species.Species; import org.forester.util.BasicDescriptiveStatistics; @@ -42,12 +41,12 @@ import org.forester.util.ForesterUtil; public class DomainLengthsTable { - private final static DecimalFormat DF = new DecimalFormat( "#.0" ); - final SortedMap _domain_lengths; - final List _species; + private final static DecimalFormat DF = new DecimalFormat( "#.0" ); + final SortedMap _domain_lengths; + final List _species; public DomainLengthsTable() { - _domain_lengths = new TreeMap(); + _domain_lengths = new TreeMap(); _species = new ArrayList(); } @@ -59,7 +58,7 @@ public class DomainLengthsTable { getDomainLengths().put( domain_lengths.getDomainId(), domain_lengths ); } - private void addLength( final DomainId domain_id, final Species species, final int domain_length ) { + private void addLength( final String domain_id, final Species species, final int domain_length ) { if ( !getDomainLengths().containsKey( domain_id ) ) { addDomainLengths( new DomainLengths( domain_id ) ); } @@ -87,7 +86,7 @@ public class DomainLengthsTable { return stats; } - public DescriptiveStatistics calculateMeanBasedStatisticsForDomain( final DomainId domain_id ) { + public DescriptiveStatistics calculateMeanBasedStatisticsForDomain( final String domain_id ) { return getDomainLengths( domain_id ).calculateMeanBasedStatistics(); } @@ -143,11 +142,11 @@ public class DomainLengthsTable { return sb; } - private SortedMap getDomainLengths() { + private SortedMap getDomainLengths() { return _domain_lengths; } - public DomainLengths getDomainLengths( final DomainId domain_id ) { + public DomainLengths getDomainLengths( final String domain_id ) { return getDomainLengths().get( domain_id ); } @@ -159,7 +158,7 @@ public class DomainLengthsTable { return list; } - public DescriptiveStatistics getLengthStatistic( final DomainId domain_id, final Species species ) { + public DescriptiveStatistics getLengthStatistic( final String domain_id, final Species species ) { return getDomainLengths( domain_id ).getLengthStatistic( species ); }