X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FComparison.java;h=50472a53ac0851542b951933e39c1927807f3eb5;hb=1d6bdfa4ce1d88c055a257e542de6b8542144d91;hp=320855ac4c0a733c905a364c3d5743e150ae89de;hpb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;p=jalview.git

diff --git a/src/jalview/util/Comparison.java b/src/jalview/util/Comparison.java
index 320855a..50472a5 100755
--- a/src/jalview/util/Comparison.java
+++ b/src/jalview/util/Comparison.java
@@ -1,6 +1,6 @@
 /*
 * Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
@@ -16,17 +16,35 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 */
-
 package jalview.util;
 
 import jalview.datamodel.*;
 
-public class Comparison {
 
-  public static float compare(SequenceI ii, SequenceI jj)
+/**
+ * DOCUMENT ME!
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class Comparison
+{
+  /** DOCUMENT ME!! */
+  public static final String GapChars = " .-";
+
+  /**
+   * DOCUMENT ME!
+   *
+   * @param ii DOCUMENT ME!
+   * @param jj DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public static final float compare(SequenceI ii, SequenceI jj)
   {
-    return Comparison.compare(ii,jj,0,ii.getLength()-1);
+    return Comparison.compare(ii, jj, 0, ii.getLength() - 1);
   }
+
   /**
    * this was supposed to be an ungapped pid calculation
    * @param ii SequenceI
@@ -35,147 +53,170 @@ public class Comparison {
    * @param end int
    * @return float
    */
-  public static float compare(SequenceI ii, SequenceI jj, int start, int end) {
-
-     String si   = ii.getSequence();
-     String sj   = jj.getSequence();
-
-     int ilen = si.length()-1;
-     int jlen = sj.length()-1;
-
-     while (jalview.util.Comparison.isGap(si.charAt(start + ilen)))
-     {
-       ilen--;
-     }
-
-     while (jalview.util.Comparison.isGap(sj.charAt(start + jlen)))
-     {
-       jlen--;
-     }
-
-     int   count = 0;
-     int   match = 0;
-     float pid   = -1;
-
-     if (ilen > jlen) {
-
-       for (int j = 0; j < jlen; j++) {
-         if (si.substring(start + j,start + j+1).equals(sj.substring(start + j,start + j+1))) {
-           match++;
-         }
-         count++;
-       }
-       pid = (float)match/(float)ilen * 100;
-     } else {
-       for (int j = 0; j < jlen; j++) {
-         if (si.substring(start + j,start + j+1).equals(sj.substring(start + j,start + j+1))) {
-           match++;
-         }
-         count++;
-       }
-       pid = (float)match/(float)jlen * 100;
-     }
-
-    return pid;
-  }
-
-  /**
-   * this is a gapped PID calculation
-   *
-   * @param s1 SequenceI
-   * @param s2 SequenceI
-   * @return float
-   */
-  public static float PID(SequenceI s1 , SequenceI s2)
+  public static float compare(SequenceI ii, SequenceI jj, int start, int end)
   {
-    int len;
-
-    if (s1.getSequence().length() > s2.getSequence().length())
-      len = s1.getSequence().length();
-    else
-      len = s2.getSequence().length();
+    String si = ii.getSequenceAsString();
+    String sj = jj.getSequenceAsString();
 
+    int ilen = si.length() - 1;
+    int jlen = sj.length() - 1;
 
-    int bad = 0;
-
-    for (int i = 0; i < len; i++)
+    while (jalview.util.Comparison.isGap(si.charAt(start + ilen)))
     {
-      char chr1;
-      char chr2;
+      ilen--;
+    }
 
-      if (i < s1.getSequence().length())
-        chr1 = s1.getSequence().charAt(i);
-      else
-        chr1 = '.';
+    while (jalview.util.Comparison.isGap(sj.charAt(start + jlen)))
+    {
+      jlen--;
+    }
 
+    int count = 0;
+    int match = 0;
+    float pid = -1;
 
-      if (i < s2.getSequence().length())
-        chr2 = s2.getSequence().charAt(i);
-      else
-        chr2 = '.';
+    if (ilen > jlen)
+    {
+      for (int j = 0; j < jlen; j++)
+      {
+        if (si.substring(start + j, start + j + 1).equals(sj.substring(start +
+            j, start + j + 1)))
+        {
+          match++;
+        }
 
+        count++;
+      }
 
-      if (!(jalview.util.Comparison.isGap( chr1 ))  &&  !(jalview.util.Comparison.isGap( chr2 )))
+      pid = (float) match / (float) ilen * 100;
+    }
+    else
+    {
+      for (int j = 0; j < jlen; j++)
       {
-        if (chr1!=chr2)
-          bad++;
+        if (si.substring(start + j, start + j + 1).equals(sj.substring(start +
+            j, start + j + 1)))
+        {
+          match++;
+        }
+
+        count++;
       }
+
+      pid = (float) match / (float) jlen * 100;
     }
 
-    return (float)100*(len-bad)/len;
+    return pid;
   }
 
-  // Another pid with region specification
+  /**
+   * this is a gapped PID calculation
+   *
+   * @param s1 SequenceI
+   * @param s2 SequenceI
+   * @return float
+   */
+  public final static float PID(String seq1, String seq2)
+  {
+    return PID(seq1, seq2, 0, seq1.length());
+  }
 
-  public static float PID(SequenceI s1 , SequenceI s2, int start, int end)
+  static final int caseShift = 'a' - 'A';
+
+  // Another pid with region specification
+  public final static  float PID(String seq1, String seq2, int start, int end)
   {
-    int len;
 
-    if (s1.getSequence().length() > s2.getSequence().length())
-      len = s1.getSequence().length();
-    else
-      len = s2.getSequence().length();
+    int s1len = seq1.length();
+    int s2len = seq2.length();
 
-    if (end<len)
-      len=end;
+    int len = Math.min(s1len, s2len);
 
-    if (len<start) {
+    if (end < len)
+    {
+      len = end;
+    }
+
+    if (len < start)
+    {
       start = len - 1; // we just use a single residue for the difference
     }
 
+
     int bad = 0;
+    char chr1;
+    char chr2;
+
 
     for (int i = start; i < len; i++)
     {
-      char chr1;
-      char chr2;
+      chr1 =  seq1.charAt(i) ;
 
-      if (i < s1.getSequence().length())
-        chr1 = s1.getSequence().charAt(i);
-      else
-        chr1 = '.';
+      chr2 =  seq2.charAt(i) ;
 
-
-      if (i < s2.getSequence().length())
-        chr2 = s2.getSequence().charAt(i);
-      else
-        chr2 = '.';
+      if ('a' <= chr1 && chr1 <= 'z')
+      {
+        // TO UPPERCASE !!!
+        //Faster than toUpperCase
+        chr1 -= caseShift;
+      }
+      if ('a' <= chr2 && chr2 <= 'z')
+      {
+        // TO UPPERCASE !!!
+        //Faster than toUpperCase
+        chr2 -= caseShift;
+      }
 
 
-      if (!(jalview.util.Comparison.isGap( chr1 ))  &&  !(jalview.util.Comparison.isGap( chr2 )))
+      if (chr1!=chr2 && !isGap(chr1) && !isGap(chr2) )
       {
-        if (chr1!=chr2)
           bad++;
       }
     }
 
-    return (float)100*(len-bad)/len;
+    return ( (float) 100 * (len - bad)) / len;
   }
 
+  /**
+   * DOCUMENT ME!
+   *
+   * @param c DOCUMENT ME!
+   *
+   * @return DOCUMENT ME!
+   */
+  public static final boolean isGap(char c)
+  {
+    return (c == '-' || c == '.' || c == ' ') ? true : false;
+  }
 
-  public static String GapChars = " .-";
-  public static boolean isGap(char c)
+  public static final boolean isNucleotide(SequenceI [] seqs)
   {
-    return  (c != '.' && c != '-' && c != ' ') ? false : true;
+    int i = 0, iSize = seqs.length, j, jSize;
+    float nt = 0, aa = 0;
+    char c;
+    while (i < iSize)
+    {
+      jSize = seqs[i].getLength();
+      for (j = 0; j < jSize; j++)
+      {
+        c = seqs[i].getCharAt(j);
+        if ('a' <= c && c <= 'z')
+          c -= ('a' - 'A');
+
+        if (c == 'A' || c == 'G' || c == 'C' || c == 'T' || c == 'U')
+          nt++;
+        else if (!jalview.util.Comparison.isGap( seqs[i].getCharAt(j)))
+        {
+          aa++;
+        }
+      }
+      i++;
+    }
+
+    if ( (nt / (nt + aa)) > 0.85f)
+      return true;
+    else
+      return false;
+
   }
 }