X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FDomainSimilarity.java;h=db25dd506d3ea78167fed9668c7e15a69eb10f34;hb=5cad5dbd4f9e8cf09a123d4ee490cf314c05fd2f;hp=72d03f1fa15a759e6e19981583254f1bd6d235ec;hpb=bd7bf76e7b7d9f4f643f05f6aadc4f517f875254;p=jalview.git diff --git a/forester/java/src/org/forester/surfacing/DomainSimilarity.java b/forester/java/src/org/forester/surfacing/DomainSimilarity.java index 72d03f1..db25dd5 100644 --- a/forester/java/src/org/forester/surfacing/DomainSimilarity.java +++ b/forester/java/src/org/forester/surfacing/DomainSimilarity.java @@ -110,7 +110,7 @@ public class DomainSimilarity implements Comparable { final int s = species_data.size(); if ( ( ( s * s ) - s ) != ( getN() * 2 ) ) { throw new IllegalArgumentException( "illegal species count and n: species count:" + s + ", n:" + _n - + " for domain " + combinable_domains.getKeyDomain() ); + + " for domain " + combinable_domains.getKeyDomain() ); } if ( s > 2 ) { if ( getMaximalDifferenceInCounts() < 0 ) { @@ -159,6 +159,7 @@ public class DomainSimilarity implements Comparable { } } + @Override public int compareTo( final DomainSimilarity domain_similarity ) { if ( this == domain_similarity ) { return EQUAL; @@ -191,10 +192,10 @@ public class DomainSimilarity implements Comparable { /** * For pairwise similarities, this should return the "difference"; for example the difference in counts * for copy number based features (the same as getMaximalDifferenceInCounts(), or the number - * of actually different domain combinations. + * of actually different domain combinations. * For pairwise similarities, this should return the difference, * while for comparisons of more than two domains, this should return the maximal difference - * + * */ public int getMaximalDifference() { return _max_difference; @@ -204,8 +205,8 @@ public class DomainSimilarity implements Comparable { * For pairwise similarities, this should return the difference in counts, * while for comparisons of more than two domains, this should return the maximal difference * in counts - * - * + * + * * @return the (maximal) difference in counts */ public int getMaximalDifferenceInCounts() { @@ -227,7 +228,7 @@ public class DomainSimilarity implements Comparable { /** * This should return the number of pairwise distances used to calculate * this similarity score - * + * * @return the number of pairwise distances */ public int getN() { @@ -249,8 +250,8 @@ public class DomainSimilarity implements Comparable { /** * This should return a map, which maps species names to * SpeciesSpecificDomainSimilariyData - * - * + * + * * @return SortedMap */ public SortedMap getSpeciesData() { @@ -537,7 +538,7 @@ public class DomainSimilarity implements Comparable { sb.append( "" ); sb.append( "" ); sb.append( "gs" ); + + "\" target=\"gs_window\">gs" ); sb.append( "" ); if ( getMaximalSimilarityScore() > 0 ) { sb.append( "" ); @@ -629,6 +630,7 @@ public class DomainSimilarity implements Comparable { _base = base; } + @Override public int compare( final String a, final String b ) { if ( _base.get( a ) >= _base.get( b ) ) { return -1;