X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignedCodonFrame.java;h=1b3c33490c9e50b715a4dbbdef45c05437149092;hb=ed71ad3c91cd2609f3e91a8027b2c0877b018dea;hp=9fa11ccd98c9cd4212a04970920ac23a574347a5;hpb=c9296c060f69f3eeab1f6da2a07dbdb87c946e52;p=jalview.git

diff --git a/src/jalview/datamodel/AlignedCodonFrame.java b/src/jalview/datamodel/AlignedCodonFrame.java
index 9fa11cc..1b3c334 100644
--- a/src/jalview/datamodel/AlignedCodonFrame.java
+++ b/src/jalview/datamodel/AlignedCodonFrame.java
@@ -118,19 +118,20 @@ public class AlignedCodonFrame
      */
     public boolean covers(SequenceI seq)
     {
-      return covers(seq,false);
+      return covers(seq,false,false);
     }
     /**
      * 
      * @param seq
-     * @param localCover - when true - compare extent of seq's dataset sequence rather than the local extent 
-     * @return true if mapping covers full length of given sequence 
+     * @param localCover - when true - compare extent of seq's dataset sequence rather than the local extent
+     * @param either - when true coverage is required for either seq or the mapped sequence 
+     * @return true if mapping covers full length of given sequence (or the other if either==true)
      */
-    public boolean covers(SequenceI seq, boolean localCover)
+    public boolean covers(SequenceI seq, boolean localCover,boolean either)
     {
-      List<int[]> mappedRanges = null;
+      List<int[]> mappedRanges = null,otherRanges=null;
       MapList mapList = mapping.getMap();
-      int mstart=seq.getStart(),mend=seq.getEnd()
+      int mstart=seq.getStart(),mend=seq.getEnd(),ostart,oend;
               ;
       if (fromSeq == seq || fromSeq == seq.getDatasetSequence())
       {
@@ -140,6 +141,9 @@ public class AlignedCodonFrame
           mend=fromSeq.getEnd();
         }
         mappedRanges = mapList.getFromRanges();
+        otherRanges=mapList.getToRanges();
+        ostart=mapping.to.getStart();
+        oend=mapping.to.getEnd();
       }
       else if (mapping.to == seq || mapping.to == seq.getDatasetSequence())
       {
@@ -149,6 +153,9 @@ public class AlignedCodonFrame
           mend=mapping.to.getEnd();
         }
         mappedRanges = mapList.getToRanges();
+        otherRanges=mapList.getFromRanges();
+        ostart=fromSeq.getStart();
+        oend=fromSeq.getEnd();
       }
       else
       {
@@ -160,23 +167,45 @@ public class AlignedCodonFrame
        * (necessary for circular CDS - example EMBL:J03321:AAA91567)
        * and mapped length covers (at least) sequence length
        */
-      int length = 0;
+      int length = countRange(mappedRanges,mstart,mend);
+
+      if (length != -1)
+      {
+        // add 1 to mapped length to allow for a mapped stop codon
+        if (length + 1 >= (mend - mstart + 1))
+        {
+          return true;
+        }
+      }
+      if (either)
+      {
+        // also check coverage of the other range
+        length = countRange(otherRanges, ostart, oend);
+        if (length != -1)
+        {
+          if (length + 1 >= (oend - ostart + 1))
+          {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+    private int countRange(List<int[]> mappedRanges,int mstart,int mend)
+    {
+      int length=0;
       for (int[] range : mappedRanges)
       {
         int from = Math.min(range[0], range[1]);
         int to = Math.max(range[0], range[1]);
         if (from < mstart || to > mend)
         {
-          return false;
+          return -1;
         }
         length += (to - from + 1);
       }
-      // add 1 to mapped length to allow for a mapped stop codon
-      if (length + 1 < (mend - mstart + 1))
-      {
-        return false;
-      }
-      return true;
+      return length;
+    }
     }
   }
 
@@ -455,18 +484,37 @@ public class AlignedCodonFrame
    */
   public SequenceI findAlignedSequence(SequenceI seq, AlignmentI al)
   {
+    return findAlignedSequence(seq, al, null);
+  }
+  /**
+   * Convenience method to return the first aligned sequence in the given
+   * alignment whose dataset has a mapping with the given (aligned or dataset)
+   * sequence, and optionally the mapping that relates them 
+   * 
+   * @param seq
+   * @param al
+   * @param map - list to add the mapping to
+   * @return sequence from al that maps to seq
+   */
+  public SequenceI findAlignedSequence(SequenceI seq, AlignmentI al,List<SequenceToSequenceMapping> map)
+  {
     /*
      * Search mapped protein ('to') sequences first.
      */
     for (SequenceToSequenceMapping ssm : mappings)
     {
-      if (ssm.fromSeq == seq || ssm.fromSeq == seq.getDatasetSequence())
+      int mStart=ssm.getMapping().getMap().getFromLowest(),mEnd=ssm.getMapping().map.getFromHighest();
+      if ((ssm.fromSeq == seq || ssm.fromSeq == seq.getDatasetSequence())
+              && seq.getStart()>=mStart && seq.getEnd()<=mEnd)
       {
         for (SequenceI sourceAligned : al.getSequences())
         {
-          if (ssm.mapping.to == sourceAligned.getDatasetSequence()
-                  || ssm.mapping.to == sourceAligned)
+          if (ssm.covers(sourceAligned,true,false))
           {
+            if (map != null)
+            {
+              map.add(ssm);
+            }
             return sourceAligned;
           }
         }
@@ -478,13 +526,19 @@ public class AlignedCodonFrame
      */
     for (SequenceToSequenceMapping ssm : mappings)
     {
-      if (ssm.mapping.to == seq
+      int mStart=ssm.getMapping().getMap().getToLowest(),mEnd=ssm.getMapping().map.getToHighest();
+      if ((ssm.mapping.to == seq
               || ssm.mapping.to == seq.getDatasetSequence())
+              && seq.getStart()>=mStart && seq.getEnd()<=mEnd)
       {
         for (SequenceI sourceAligned : al.getSequences())
         {
-          if (ssm.fromSeq == sourceAligned.getDatasetSequence())
+          if (ssm.covers(sourceAligned,true,true))
           {
+            if (map != null)
+            {
+              map.add(ssm);
+            }
             return sourceAligned;
           }
         }