X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FComparison.java;h=f8e1fcd47a427a508000f8e82dca270cbe639d1e;hb=471a99eebdcb33c3a977abc3e2fb228286590fc3;hp=bb0cdf0c2c064cd61fcb1d253ceed729bdfa6b50;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/util/Comparison.java b/src/jalview/util/Comparison.java
old mode 100755
new mode 100644
index bb0cdf0..f8e1fcd
--- a/src/jalview/util/Comparison.java
+++ b/src/jalview/util/Comparison.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -133,7 +133,20 @@ public class Comparison
   // Another pid with region specification
   public final static float PID(String seq1, String seq2, int start, int end)
   {
-
+	return PID(seq1, seq2, start, end, true,false);
+  }
+  /**
+   * Calculate percent identity for a pair of sequences over a particular range, with different options for ignoring gaps.
+   * @param seq1
+   * @param seq2
+   * @param start - position in seqs
+   * @param end - position in seqs
+   * @param wcGaps - if true - gaps match any character, if false, do not match anything
+   * @param ungappedOnly - if true - only count PID over ungapped columns
+   * @return
+   */
+  public final static float PID(String seq1, String seq2, int start, int end, boolean wcGaps, boolean ungappedOnly)
+  {
     int s1len = seq1.length();
     int s2len = seq2.length();
 
@@ -149,16 +162,16 @@ public class Comparison
       start = len - 1; // we just use a single residue for the difference
     }
 
-    int bad = 0;
+    int elen=len-start,bad = 0;
     char chr1;
     char chr2;
-
+    boolean agap;
     for (int i = start; i < len; i++)
     {
       chr1 = seq1.charAt(i);
 
       chr2 = seq2.charAt(i);
-
+      agap = isGap(chr1) || isGap(chr2);
       if ('a' <= chr1 && chr1 <= 'z')
       {
         // TO UPPERCASE !!!
@@ -171,14 +184,25 @@ public class Comparison
         // Faster than toUpperCase
         chr2 -= caseShift;
       }
-
-      if (chr1 != chr2 && !isGap(chr1) && !isGap(chr2))
+      
+      if (chr1 != chr2)
       {
-        bad++;
+    	if (agap)
+    	{
+    		if (ungappedOnly)
+    		{
+    			elen--;
+    		} else if (!wcGaps) {
+    			bad++;
+    		}
+    	} else {
+    		bad++;
+    	}
       }
+      
     }
-
-    return ((float) 100 * (len - bad)) / len;
+    if (elen<1) { return 0f; }
+    return ((float) 100 * (elen - bad)) / elen;
   }
 
   /**