X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2FAlignSeq.java;h=4a8955bee6bf8ee3f8d4da23bc5cffd6a50392d5;hb=59d682209891099d46b960509907c79e3fb276fe;hp=15727ef31efa3ea88f74bc25ca3466abcfb85074;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git

diff --git a/src/jalview/analysis/AlignSeq.java b/src/jalview/analysis/AlignSeq.java
index 15727ef..4a8955b 100755
--- a/src/jalview/analysis/AlignSeq.java
+++ b/src/jalview/analysis/AlignSeq.java
@@ -1,13 +1,13 @@
 /*
- * 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.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
@@ -143,7 +143,7 @@ public class AlignSeq
   public AlignSeq(SequenceI s1, String string1, SequenceI s2,
           String string2, String type)
   {
-    SeqInit(s1, string1, s2, string2, type);
+    SeqInit(s1, string1.toUpperCase(), s2, string2.toUpperCase(), type);
   }
 
   /**
@@ -382,13 +382,13 @@ public class AlignSeq
     {
       intToStr = pep;
       charToInt = ResidueProperties.aaIndex;
-      defInt = 23;
+      defInt = ResidueProperties.maxProteinIndex;
     }
     else if (type.equals(AlignSeq.DNA))
     {
       intToStr = dna;
       charToInt = ResidueProperties.nucleotideIndex;
-      defInt = 4;
+      defInt = ResidueProperties.maxNucleotideIndex;
     }
     else
     {
@@ -501,12 +501,25 @@ public class AlignSeq
     // TODO: Use original sequence characters rather than re-translated
     // characters in output
     // Find the biggest id length for formatting purposes
+    String s1id = s1.getName(), s2id = s2.getName();
     int maxid = s1.getName().length();
     if (s2.getName().length() > maxid)
     {
       maxid = s2.getName().length();
     }
-
+    if (maxid > 30)
+    {
+      maxid = 30;
+      // JAL-527 - truncate the sequence ids
+      if (s1.getName().length() > maxid)
+      {
+        s1id = s1.getName().substring(0, 30);
+      }
+      if (s2.getName().length() > maxid)
+      {
+        s2id = s2.getName().substring(0, 30);
+      }
+    }
     int len = 72 - maxid - 1;
     int nochunks = ((aseq1.length - count) / len) + 1;
     pid = 0;
@@ -525,8 +538,7 @@ public class AlignSeq
     for (int j = 0; j < nochunks; j++)
     {
       // Print the first aligned sequence
-      output.append(new Format("%" + (maxid) + "s").form(s1.getName())
-              + " ");
+      output.append(new Format("%" + (maxid) + "s").form(s1id) + " ");
 
       for (int i = 0; i < len; i++)
       {
@@ -572,8 +584,7 @@ public class AlignSeq
 
       // Now print the second aligned sequence
       output = output.append("\n");
-      output = output.append(new Format("%" + (maxid) + "s").form(s2
-              .getName())
+      output = output.append(new Format("%" + (maxid) + "s").form(s2id)
               + " ");
 
       for (int i = 0; i < len; i++)
@@ -907,4 +918,93 @@ public class AlignSeq
       }
     }
   }
+
+  /**
+   * compute the PID vector used by the redundancy filter.
+   * 
+   * @param originalSequences
+   *          - sequences in alignment that are to filtered
+   * @param omitHidden
+   *          - null or strings to be analysed (typically, visible portion of
+   *          each sequence in alignment)
+   * @param start
+   *          - first column in window for calculation
+   * @param end
+   *          - last column in window for calculation
+   * @param ungapped
+   *          - if true then use ungapped sequence to compute PID
+   * @return vector containing maximum PID for i-th sequence and any sequences
+   *         longer than that seuqence
+   */
+  public static float[] computeRedundancyMatrix(
+          SequenceI[] originalSequences, String[] omitHidden, int start,
+          int end, boolean ungapped)
+  {
+    int height = originalSequences.length;
+    float[] redundancy = new float[height];
+    int[] lngth = new int[height];
+    for (int i = 0; i < height; i++)
+    {
+      redundancy[i] = 0f;
+      lngth[i] = -1;
+    }
+
+    // long start = System.currentTimeMillis();
+
+    float pid;
+    String seqi, seqj;
+    for (int i = 0; i < height; i++)
+    {
+
+      for (int j = 0; j < i; j++)
+      {
+        if (i == j)
+        {
+          continue;
+        }
+
+        if (omitHidden == null)
+        {
+          seqi = originalSequences[i].getSequenceAsString(start, end);
+          seqj = originalSequences[j].getSequenceAsString(start, end);
+        }
+        else
+        {
+          seqi = omitHidden[i];
+          seqj = omitHidden[j];
+        }
+        if (lngth[i] == -1)
+        {
+          String ug = AlignSeq.extractGaps(Comparison.GapChars, seqi);
+          lngth[i] = ug.length();
+          if (ungapped)
+          {
+            seqi = ug;
+          }
+        }
+        if (lngth[j] == -1)
+        {
+          String ug = AlignSeq.extractGaps(Comparison.GapChars, seqj);
+          lngth[j] = ug.length();
+          if (ungapped)
+          {
+            seqj = ug;
+          }
+        }
+        pid = Comparison.PID(seqi, seqj);
+
+        // use real sequence length rather than string length
+        if (lngth[j] < lngth[i])
+        {
+          redundancy[j] = Math.max(pid, redundancy[j]);
+        }
+        else
+        {
+          redundancy[i] = Math.max(pid, redundancy[i]);
+        }
+
+      }
+    }
+    return redundancy;
+  }
 }