X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2FAlignmentSorter.java;h=bdd6bce55604291d6ae4c69d5b3f9dd8f1999767;hb=e657ed3c87bbdbaef21efe142d8123f29617d357;hp=40ad37254b6624d3bb8ecfbebed408711fc420cb;hpb=587e55e539d6268657467be71a904f011b890181;p=jalview.git

diff --git a/src/jalview/analysis/AlignmentSorter.java b/src/jalview/analysis/AlignmentSorter.java
index 40ad372..bdd6bce 100755
--- a/src/jalview/analysis/AlignmentSorter.java
+++ b/src/jalview/analysis/AlignmentSorter.java
@@ -1,299 +1,332 @@
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2005 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
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program 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 PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* 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.analysis;
 
 import jalview.datamodel.*;
-import jalview.util.*;
+
 import jalview.io.*;
 
+import jalview.util.*;
+
 import java.util.*;
 
+
 /** Data structure to hold and manipulate a multiple sequence alignment
  */
 public class AlignmentSorter {
-
-  private AlignmentSorter() {
-    try
-    {
-      jbInit();
+    /**    */
+    static boolean sortIdAscending = true;
+    static int lastGroupHash = 0;
+    static boolean sortGroupAscending = true;
+    static AlignmentOrder lastOrder = null;
+    static boolean sortOrderAscending = true;
+    static NJTree lastTree = null;
+    static boolean sortTreeAscending = true;
+
+    /**
+     * Sort by Percentage Identity
+     *
+     * @param align AlignmentI
+     * @param s SequenceI
+     */
+    public static void sortByPID(AlignmentI align, SequenceI s) {
+        int nSeq = align.getHeight();
+
+        float[] scores = new float[nSeq];
+        SequenceI[] seqs = new SequenceI[nSeq];
+
+        for (int i = 0; i < nSeq; i++) {
+            scores[i] = Comparison.PID(align.getSequenceAt(i), s);
+            seqs[i] = align.getSequenceAt(i);
+        }
+
+        QuickSort.sort(scores, 0, scores.length - 1, seqs);
+
+        setReverseOrder(align, seqs);
     }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-  }
 
-  public static void sortGroups(AlignmentI align) {
-    Vector groups = align.getGroups();
-    int    nGroup = groups.size();
+    private static void setReverseOrder(AlignmentI align, SequenceI[] seqs) {
+        int nSeq = seqs.length;
+
+        int len = 0;
 
-    float[]  arr = new float [nGroup];
-    Object[] s   = new Object[nGroup];
+        if ((nSeq % 2) == 0) {
+            len = nSeq / 2;
+        } else {
+            len = (nSeq + 1) / 2;
+        }
 
-    for (int i=0; i < nGroup; i++) {
-      arr[i] = ((SequenceGroup)groups.elementAt(i)).getSize();
-      s[i]   = groups.elementAt(i);
+        // NOTE: DO NOT USE align.setSequenceAt() here - it will NOT work
+        for (int i = 0; i < len; i++) {
+            //SequenceI tmp = seqs[i];
+            align.getSequences().setElementAt(seqs[nSeq - i - 1], i);
+            align.getSequences().setElementAt(seqs[i], nSeq - i - 1);
+        }
     }
 
-    QuickSort.sort(arr,s);
+    private static void setOrder(AlignmentI align, Vector tmp) {
+        setOrder(align, vectorSubsetToArray(tmp, align.getSequences()));
+    }
 
-    Vector newg = new Vector(nGroup);
+    private static void setOrder(AlignmentI align, SequenceI[] seqs) {
 
-    for (int i=nGroup-1; i >= 0; i--) {
-      newg.addElement(s[i]);
+        // NOTE: DO NOT USE align.setSequenceAt() here - it will NOT work
+        Vector algn = align.getSequences();
+        for (int i = 0; i < seqs.length; i++)
+        {
+          algn.setElementAt(seqs[i], i);
+        }
     }
 
-    //    align.setGroups(newg);
-  }
+    public static void sortByID(AlignmentI align) {
+        int nSeq = align.getHeight();
+
+        String[] ids = new String[nSeq];
+        SequenceI[] seqs = new SequenceI[nSeq];
+
+        for (int i = 0; i < nSeq; i++) {
+            ids[i] = align.getSequenceAt(i).getName();
+            seqs[i] = align.getSequenceAt(i);
+        }
+
+        QuickSort.sort(ids, seqs);
 
-  /**
-   * Sort by Percentage Identity
-   *
-   * @param align AlignmentI
-   * @param s SequenceI
-   */
-  public static void sortByPID(AlignmentI align, SequenceI s) {
-    int nSeq = align.getHeight();
+        if (sortIdAscending) {
+            setReverseOrder(align, seqs);
+        } else {
+            setOrder(align, seqs);
+        }
 
-    float     scores[] = new float[nSeq];
-    SequenceI seqs[]   = new SequenceI[nSeq];
+        sortIdAscending = !sortIdAscending;
+    }
 
-    for (int i = 0; i < nSeq; i++) {
-      scores[i] = Comparison.compare(align.getSequenceAt(i),s);
-      seqs[i]   = align.getSequenceAt(i);
+    public static void sortByGroup(AlignmentI align) {
+      //MAINTAINS ORIGNAL SEQUENCE ORDER,
+      //ORDERS BY GROUP SIZE
+
+        Vector groups = new Vector();
+
+        if (groups.hashCode() != lastGroupHash) {
+            sortGroupAscending = true;
+            lastGroupHash = groups.hashCode();
+        } else {
+            sortGroupAscending = !sortGroupAscending;
+        }
+
+        //SORTS GROUPS BY SIZE
+        //////////////////////
+        for(int i=0; i<align.getGroups().size(); i++)
+        {
+           SequenceGroup sg = (SequenceGroup) align.getGroups().elementAt(i);
+
+           for(int j=0; j<groups.size(); j++)
+           {
+             SequenceGroup sg2 = (SequenceGroup) groups.elementAt(j);
+             if(sg.getSize() > sg2.getSize())
+             {
+               groups.insertElementAt(sg, j);
+               break;
+             }
+           }
+
+           if (!groups.contains(sg))
+           {
+             groups.addElement(sg);
+           }
+        }
+
+        //NOW ADD SEQUENCES MAINTAINING ALIGNMENT ORDER
+        ///////////////////////////////////////////////
+        Vector seqs = new Vector();
+        for (int i = 0; i < groups.size(); i++)
+        {
+            SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
+            SequenceI [] orderedseqs = sg.getSequencesInOrder(align);
+            for (int j = 0; j < orderedseqs.length; j++)
+            {
+                seqs.addElement(orderedseqs[j]);
+            }
+        }
+
+        if (sortGroupAscending) {
+            setOrder(align, seqs);
+        } else {
+            setReverseOrder(align,
+                vectorSubsetToArray(seqs, align.getSequences()));
+        }
     }
 
-    QuickSort.sort(scores,0,scores.length-1,seqs);
+    private static SequenceI[] vectorToArray(Vector tmp) {
 
-   setReverseOrder(align,seqs);
-  }
+        SequenceI[] seqs = new SequenceI[tmp.size()];
 
-  private static void setReverseOrder(AlignmentI align, SequenceI [] seqs) {
-    int nSeq = seqs.length;
+        for (int i = 0; i < tmp.size(); i++) {
+            seqs[i] = (SequenceI) tmp.elementAt(i);
+        }
 
-    int len = 0;
-    if (nSeq%2 == 0) {
-      len = nSeq/2;
-    } else {
-      len = (nSeq+1)/2;
+        return seqs;
     }
 
-// NOTE: DO NOT USE align.setSequenceAt() here - it will NOT work
-    for (int i = 0; i < len; i++) {
-      //SequenceI tmp = seqs[i];
-      align.getSequences().setElementAt(seqs[nSeq-i-1],i);
-      align.getSequences().setElementAt(seqs[i],nSeq-i-1);
-    }
-  }
+    private static SequenceI[] vectorSubsetToArray(Vector tmp, Vector mask) {
+        Vector seqs = new Vector();
+        int i;
+        boolean[] tmask = new boolean[mask.size()];
 
-  private static void setOrder(AlignmentI align, Vector tmp) {
-    setOrder(align,vectorSubsetToArray(tmp, align.getSequences()));
-  }
+        for (i = 0; i < mask.size(); i++)
+            tmask[i] = true;
 
-  private static void setOrder(AlignmentI align, SequenceI [] seqs) {
-      // NOTE: DO NOT USE align.setSequenceAt() here - it will NOT work
+        for (i = 0; i < tmp.size(); i++) {
 
-      Vector algn = align.getSequences();
+            Object sq = tmp.elementAt(i);
 
-      for (int i = 0, p = 0; i < seqs.length; i++)
-        algn.setElementAt(seqs[i], p++);
-  }
-  /**    */
-  static boolean sortIdAscending = true;
-  public static void sortByID(AlignmentI align) {
-    int nSeq = align.getHeight();
+            if (mask.contains(sq) && tmask[mask.indexOf(sq)])
+            {
+                tmask[mask.indexOf(sq)] = false;
+                seqs.addElement(sq);
+            }
+        }
 
-    String    ids[]   = new String[nSeq];
-    SequenceI seqs[]  = new SequenceI[nSeq];
+        for (i = 0; i < tmask.length; i++)
+            if (tmask[i]) {
+                seqs.addElement(mask.elementAt(i));
+            }
 
-    for (int i = 0; i < nSeq; i++) {
-      ids[i]  = align.getSequenceAt(i).getName();
-      seqs[i] = align.getSequenceAt(i);
+        return vectorToArray(seqs);
     }
 
-    QuickSort.sort(ids,seqs);
+    public static void sortBy(AlignmentI align, AlignmentOrder order) {
+        // Get an ordered vector of sequences which may also be present in align
+        Vector tmp = order.getOrder();
+
+        if (lastOrder == order) {
+            sortOrderAscending = !sortOrderAscending;
+        } else {
+            sortOrderAscending = true;
+        }
+
+        if (sortOrderAscending) {
+            setOrder(align, tmp);
+        } else {
+            setReverseOrder(align,
+                vectorSubsetToArray(tmp, align.getSequences()));
+        }
+    }
 
-    if(sortIdAscending)
-      setReverseOrder(align,seqs);
-    else
-      setOrder(align, seqs);
+    public static Vector getOrderByTree(AlignmentI align, NJTree tree) {
+        int nSeq = align.getHeight();
 
-    sortIdAscending = !sortIdAscending;
-  }
-  static int lastGroupHash = 0;
-  static boolean sortGroupAscending = true;
+        Vector tmp = new Vector();
 
-  public static void sortByGroup(AlignmentI align) {
-    int    nSeq = align.getHeight();
-    Vector groups = align.getGroups();
-    if (groups.hashCode()!=lastGroupHash) {
-      sortGroupAscending=true;
-      lastGroupHash = groups.hashCode();
-    } else
-      sortGroupAscending = ! sortGroupAscending;
+        tmp = _sortByTree(tree.getTopNode(), tmp, align.getSequences());
 
-    Vector seqs = new Vector();
+        if (tmp.size() != nSeq) {
+            // TODO: JBPNote - decide if this is always an error
+            // (eg. not when a tree is associated to another alignment which has more
+            //  sequences)
+            if (tmp.size() < nSeq) {
+                addStrays(align, tmp);
+            }
 
-    for (int i=0; i < groups.size(); i++) {
-      SequenceGroup sg = (SequenceGroup)groups.elementAt(i);
+            if (tmp.size() != nSeq) {
+                System.err.println("ERROR: tmp.size()=" + tmp.size() +
+                    " != nseq=" + nSeq + " in getOrderByTree");
+            }
+        }
 
-      for (int j = 0; j < sg.getSize(); j++) {
-        seqs.addElement(sg.getSequenceAt(j));
-      }
+        return tmp;
     }
 
-    // Deletions can happen so this check may fail
-    /*
-     if (seqs.size() != nSeq) {
-      System.err.println("ERROR: tmp.size() != nseq in sortByGroups");
-      if (seqs.size() < nSeq) {
-        addStrays(align,seqs);
-      }
+    public static void sortByTree(AlignmentI align, NJTree tree) {
+        Vector tmp = getOrderByTree(align, tree);
+
+        // tmp should properly permute align with tree.
+        if (lastTree != tree) {
+            sortTreeAscending = true;
+            lastTree = tree;
+        } else {
+            sortTreeAscending = !sortTreeAscending;
+        }
+
+        if (sortTreeAscending) {
+            setOrder(align, tmp);
+        } else {
+            setReverseOrder(align,
+                vectorSubsetToArray(tmp, align.getSequences()));
+        }
     }
-*/
-    if(sortGroupAscending)
-      setOrder(align,seqs);
-    else
-      setReverseOrder( align, vectorSubsetToArray(seqs, align.getSequences()));
 
-  }
+    private static void addStrays(AlignmentI align, Vector seqs) {
+        int nSeq = align.getHeight();
 
-  private static SequenceI [] vectorToArray(Vector tmp) {
-    SequenceI[] seqs = new SequenceI[tmp.size()];
+        for (int i = 0; i < nSeq; i++) {
+            if (!seqs.contains(align.getSequenceAt(i))) {
+                seqs.addElement(align.getSequenceAt(i));
+            }
+        }
 
-    for (int i=0; i < tmp.size(); i++) {
-      seqs[i] = (SequenceI)tmp.elementAt(i);
-    }
-    return seqs;
-  }
-
-  private static SequenceI [] vectorSubsetToArray(Vector tmp, Vector mask) {
-    Vector seqs = new Vector();
-    int i,m, p;
-    boolean[] tmask = new boolean[m=mask.size()];
-    for (i=0; i<m; i++)
-      tmask[i] = true;
-    for (i=0; i < tmp.size(); i++) {
-      Object sq;
-      if (mask.contains(sq=tmp.elementAt(i))) {
-        tmask[mask.indexOf(sq)] = false;
-        seqs.addElement(sq);
-        m--;
-      }
+        if (nSeq != seqs.size()) {
+            System.err.println(
+                "ERROR: Size still not right even after addStrays");
+        }
     }
-    for (i=0; i<tmask.length; i++)
-      if (tmask[i])
-        seqs.addElement(mask.elementAt(i));
-    return vectorToArray(seqs);
-  }
-
-  static AlignmentOrder lastOrder = null;
-  static boolean sortOrderAscending = true;
-
-  public static void sortBy(AlignmentI align, AlignmentOrder order) {
-    // Get an ordered vector of sequences which may also be present in align
-    Vector tmp = order.getOrder();
-//    if (tmp.size()<align.getHeight())
-//      addStrays(align, tmp);
-    if (lastOrder==order)
-      sortOrderAscending=!sortOrderAscending;
-    else
-      sortOrderAscending=true;
-
-    if (sortOrderAscending)
-      setOrder(align, tmp);
-    else
-      setReverseOrder(align, vectorSubsetToArray(tmp, align.getSequences()));
-  }
-  static NJTree lastTree = null;
-  static boolean sortTreeAscending = true;
-
-  public static Vector getOrderByTree(AlignmentI align, NJTree tree) {
-    int nSeq = align.getHeight();
-
-    Vector tmp = new Vector();
-
-    tmp = _sortByTree(tree.getTopNode(), tmp, align.getSequences());
-
-    if (tmp.size() != nSeq)
-    {
-      // TODO: JBPNote - decide if this is always an error
-      // (eg. not when a tree is associated to another alignment which has more
-      //  sequences)
-
-      if (tmp.size() < nSeq)
-      {
-        addStrays(align, tmp);
-      }
-      if (tmp.size() != nSeq)
-        System.err.println("ERROR: tmp.size()="+tmp.size()+" != nseq="+nSeq+" in getOrderByTree");
 
+    public static Vector _sortByTree(SequenceNode node, Vector tmp,
+        Vector seqset) {
+        if (node == null) {
+            return tmp;
+        }
+
+        SequenceNode left = (SequenceNode) node.left();
+        SequenceNode right = (SequenceNode) node.right();
+
+        if ((left == null) && (right == null)) {
+            if (!node.isPlaceholder() && (node.element() != null)) {
+                if (node.element() instanceof SequenceI) {
+                    if (!tmp.contains(node.element())) {
+                        tmp.addElement((SequenceI) node.element());
+                    }
+                }
+            }
+
+            return tmp;
+        } else {
+            _sortByTree(left, tmp, seqset);
+            _sortByTree(right, tmp, seqset);
+        }
+
+        return tmp;
     }
-    return tmp;
-  }
-
-  public static void sortByTree(AlignmentI align, NJTree tree) {
-    Vector tmp = getOrderByTree(align, tree);
-    // tmp should properly permute align with tree.
-    if(lastTree!=tree) {
-      sortTreeAscending = true;
-      lastTree = tree;
-    } else {
-      sortTreeAscending = !sortTreeAscending;
-    }
-    if(sortTreeAscending)
-      setOrder(align,tmp);
-    else
-      setReverseOrder(align, vectorSubsetToArray(tmp, align.getSequences()));
-  }
-
-  private static void addStrays(AlignmentI align, Vector seqs) {
-    int    nSeq = align.getHeight();
-    for (int i=0;i<nSeq;i++) {
-      if (!seqs.contains(align.getSequenceAt(i))) {
-        seqs.addElement(align.getSequenceAt(i));
-      }
-    }
-    if (nSeq != seqs.size()) {
-      System.err.println("ERROR: Size still not right even after addStrays");
-    }
-  }
 
-  public static Vector _sortByTree(SequenceNode node, Vector tmp, Vector seqset) {
-    if (node == null) {return tmp;}
+    // Ordering Objects
+    // Alignment.sortBy(OrderObj) - sequence of sequence pointer refs in appropriate order
+    //
 
-    SequenceNode left = (SequenceNode)node.left();
-    SequenceNode right = (SequenceNode)node.right();
+    /**
+     * recover the order of sequences given by the safe numbering scheme introducd
+     * SeqsetUtils.uniquify.
+     */
+    public static void recoverOrder(SequenceI[] alignment) {
+        float[] ids = new float[alignment.length];
 
-    if (left == null && right == null) {
-      if (!node.isPlaceholder() && node.element()!=null)
-        if (node.element() instanceof SequenceI)
-          if (!tmp.contains(node.element()))
-              tmp.addElement((SequenceI)node.element());
-        return tmp;
+        for (int i = 0; i < alignment.length; i++)
+            ids[i] = (new Float(alignment[i].getName().substring(8))).floatValue();
 
-    } else {
-      _sortByTree(left,tmp, seqset);
-      _sortByTree(right,tmp, seqset);
+        jalview.util.QuickSort.sort(ids, alignment);
     }
-    return tmp;
-  }
-  // Ordering Objects
-  // Alignment.sortBy(OrderObj) - sequence of sequence pointer refs in appropriate order
-  //
-
-  /**
-   * recover the order of sequences given by the safe numbering scheme introducd
-   * SeqsetUtils.uniquify.
-   */
-  public static void recoverOrder(SequenceI[] alignment) {
-    float[] ids = new float[alignment.length];
-    for (int i=0; i<alignment.length; i++)
-      ids[i] = (new Float(alignment[i].getName().substring(8))).floatValue();
-    jalview.util.QuickSort.sort(ids, alignment);
-  }
-
-  private void jbInit()
-      throws Exception
-  {
-  }
-
 }