X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsurfacing%2FDomainCountsBasedPairwiseSimilarityCalculator.java;h=904b642c4fb9f059603008b579322a5f5a97da99;hb=06b38f91bc061d8ab1dfea3b6238c94c95a30d26;hp=6077ffc359c1937e1d2020b1ab8b524cdf20e34b;hpb=656be28debec520e0e35a8b311114398a40ea366;p=jalview.git

diff --git a/forester/java/src/org/forester/surfacing/DomainCountsBasedPairwiseSimilarityCalculator.java b/forester/java/src/org/forester/surfacing/DomainCountsBasedPairwiseSimilarityCalculator.java
index 6077ffc..904b642 100644
--- a/forester/java/src/org/forester/surfacing/DomainCountsBasedPairwiseSimilarityCalculator.java
+++ b/forester/java/src/org/forester/surfacing/DomainCountsBasedPairwiseSimilarityCalculator.java
@@ -35,8 +35,12 @@ public class DomainCountsBasedPairwiseSimilarityCalculator implements PairwiseDo
         if ( !domains_1.getKeyDomain().equals( domains_2.getKeyDomain() ) ) {
             throw new IllegalArgumentException( "attempt to calculate similarity between domain collection with different keys" );
         }
-        final int dc1 = domains_1.getKeyDomainCount();
-        final int dc2 = domains_2.getKeyDomainCount();
-        return new CountsBasedPairwiseDomainSimilarity( dc1 - dc2, dc1 + dc2 );
+        if ( ( domains_1.getKeyDomainCount() > Short.MAX_VALUE ) || ( domains_2.getKeyDomainCount() > Short.MAX_VALUE )
+                || ( ( domains_1.getKeyDomainCount() + domains_2.getKeyDomainCount() ) > Short.MAX_VALUE ) ) {
+            throw new IllegalArgumentException( "too large for short!" );
+        }
+        final short dc1 = ( short ) domains_1.getKeyDomainCount();
+        final short dc2 = ( short ) domains_2.getKeyDomainCount();
+        return new CountsBasedPairwiseDomainSimilarity( ( short ) ( dc1 - dc2 ), ( short ) ( dc1 + dc2 ) );
     }
 }