JAL-3081 more efficient algorithm for annotation ordering by sequence

diff --git a/src/jalview/analysis/AlignmentUtils.java b/src/jalview/analysis/AlignmentUtils.java
index 0dfd383..f1e9551 100644 (file)
--- a/src/jalview/analysis/AlignmentUtils.java
+++ b/src/jalview/analysis/AlignmentUtils.java
@@ -228,30 +228,6 @@ public class AlignmentUtils
   }
 
   /**
-   * Returns the index (zero-based position) of a sequence in an alignment, or
-   * -1 if not found.
-   * 
-   * @param al
-   * @param seq
-   * @return
-   */
-  public static int getSequenceIndex(AlignmentI al, SequenceI seq)
-  {
-    int result = -1;
-    int pos = 0;
-    for (SequenceI alSeq : al.getSequences())
-    {
-      if (alSeq == seq)
-      {
-        result = pos;
-        break;
-      }
-      pos++;
-    }
-    return result;
-  }
-
-  /**
    * Returns a map of lists of sequences in the alignment, keyed by sequence
    * name. For use in mapping between different alignment views of the same
    * sequences.

diff --git a/src/jalview/analysis/AnnotationSorter.java b/src/jalview/analysis/AnnotationSorter.java
index 5a7e72f..e5e9de4 100644 (file)
--- a/src/jalview/analysis/AnnotationSorter.java
+++ b/src/jalview/analysis/AnnotationSorter.java
@@ -283,8 +283,15 @@ public class AnnotationSorter
     {
       return;
     }
-    // cache 'alignment sequence position' for the annotations
-    saveSequenceIndices(alignmentAnnotations);
+
+    /*
+     * cache 'alignment sequence positions' if required for sorting
+     */
+    if (order == SequenceAnnotationOrder.SEQUENCE_AND_LABEL
+            || order == SequenceAnnotationOrder.LABEL_AND_SEQUENCE)
+    {
+      saveSequenceIndices(alignmentAnnotations);
+    }
 
     Comparator<? super AlignmentAnnotation> comparator = getComparator(
             order);
@@ -309,13 +316,19 @@ public class AnnotationSorter
           AlignmentAnnotation[] alignmentAnnotations)
   {
     sequenceIndices.clear();
+
+    Map<SequenceI, Integer> seqPositions = alignment.getSequencePositions();
+
     for (AlignmentAnnotation ann : alignmentAnnotations)
     {
       SequenceI seq = ann.sequenceRef;
       if (seq != null)
       {
-        int index = AlignmentUtils.getSequenceIndex(alignment, seq);
-        sequenceIndices.put(seq, index);
+        Integer index = seqPositions.get(seq);
+        if (index != null)
+        {
+          sequenceIndices.put(seq, index);
+        }
       }
     }
   }
@@ -379,7 +392,7 @@ public class AnnotationSorter
 
   /**
    * Comparison based on position of associated sequence (if any) in the
-   * alignment. Returns zero if either argument is null.
+   * alignment
    * 
    * @param o1
    * @param o2
@@ -394,8 +407,9 @@ public class AnnotationSorter
     {
       return 0;
     }
+
     /*
-     * Sort non-sequence-related before or after sequence-related.
+     * Sort non-sequence-related before or after sequence-related
      */
     if (seq1 == null)
     {
@@ -405,21 +419,20 @@ public class AnnotationSorter
     {
       return showAutocalcAbove ? 1 : -1;
     }
-    // get sequence index - but note -1 means 'at end' so needs special handling
-    int index1 = sequenceIndices.get(seq1);
-    int index2 = sequenceIndices.get(seq2);
-    if (index1 == index2)
-    {
-      return 0;
-    }
-    if (index1 == -1)
+
+    /*
+     * else sort by associated sequence position
+     */
+    Integer index1 = sequenceIndices.get(seq1);
+    Integer index2 = sequenceIndices.get(seq2);
+    if (index1 == null)
     {
-      return -1;
+      return index2 == null ? 0 : -1;
     }
-    if (index2 == -1)
+    if (index2 == null)
     {
       return 1;
     }
-    return Integer.compare(index1, index2);
+    return Integer.compare(index1.intValue(), index2.intValue());
   }
 }