X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FMappingUtils.java;h=dbbf8a06f379946455f9c69a22fcbda3fd669ed7;hb=4a3def9f59cefe629c9a33d87483283aee085928;hp=c9922436a8fc5f42a1e0ada2190be7f292f1000e;hpb=ee5e8d9c81551a581b11dc4b0c609e2b75ab772a;p=jalview.git

diff --git a/src/jalview/util/MappingUtils.java b/src/jalview/util/MappingUtils.java
index c992243..dbbf8a0 100644
--- a/src/jalview/util/MappingUtils.java
+++ b/src/jalview/util/MappingUtils.java
@@ -29,13 +29,14 @@ import java.util.Map;
 
 import jalview.analysis.AlignmentSorter;
 import jalview.api.AlignViewportI;
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.commands.CommandI;
 import jalview.commands.EditCommand;
 import jalview.commands.EditCommand.Action;
 import jalview.commands.EditCommand.Edit;
 import jalview.commands.OrderCommand;
 import jalview.datamodel.AlignedCodonFrame;
+import jalview.datamodel.AlignedCodonFrame.SequenceToSequenceMapping;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AlignmentOrder;
 import jalview.datamodel.ColumnSelection;
@@ -80,7 +81,7 @@ public final class MappingUtils
       action = action.getUndoAction();
     }
     // TODO write this
-    Cache.log.error("MappingUtils.mapCutOrPaste not yet implemented");
+    Console.error("MappingUtils.mapCutOrPaste not yet implemented");
   }
 
   /**
@@ -367,45 +368,50 @@ public final class MappingUtils
       {
         int mappedStartResidue = 0;
         int mappedEndResidue = 0;
-
         for (AlignedCodonFrame acf : codonFrames)
         {
-          Mapping map = acf.getMappingBetween(seq, selected);
-          if (map != null)
+          // rather than use acf.getCoveringMapping() we iterate through all
+          // mappings to make sure all CDS are selected for a protein
+          for (SequenceToSequenceMapping map : acf.getMappings())
           {
-            /*
-             * Found a sequence mapping. Locate the start/end mapped residues.
-             */
-            List<AlignedCodonFrame> mapping = Arrays
-                    .asList(new AlignedCodonFrame[]
-                    { acf });
-            SearchResultsI sr = buildSearchResults(selected,
-                    startResiduePos, mapping);
-            for (SearchResultMatchI m : sr.getResults())
+            if (map.covers(selected) && map.covers(seq))
             {
-              mappedStartResidue = m.getStart();
-              mappedEndResidue = m.getEnd();
-            }
-            sr = buildSearchResults(selected, endResiduePos, mapping);
-            for (SearchResultMatchI m : sr.getResults())
-            {
-              mappedStartResidue = Math.min(mappedStartResidue,
-                      m.getStart());
-              mappedEndResidue = Math.max(mappedEndResidue, m.getEnd());
-            }
+              /*
+               * Found a sequence mapping. Locate the start/end mapped residues.
+               */
+              List<AlignedCodonFrame> mapping = Arrays
+                      .asList(new AlignedCodonFrame[]
+                      { acf });
+              // locate start
+              SearchResultsI sr = buildSearchResults(selected,
+                      startResiduePos, mapping);
+              for (SearchResultMatchI m : sr.getResults())
+              {
+                mappedStartResidue = m.getStart();
+                mappedEndResidue = m.getEnd();
+              }
+              // locate end - allowing for adjustment of start range
+              sr = buildSearchResults(selected, endResiduePos, mapping);
+              for (SearchResultMatchI m : sr.getResults())
+              {
+                mappedStartResidue = Math.min(mappedStartResidue,
+                        m.getStart());
+                mappedEndResidue = Math.max(mappedEndResidue, m.getEnd());
+              }
 
-            /*
-             * Find the mapped aligned columns, save the range. Note findIndex
-             * returns a base 1 position, SequenceGroup uses base 0
-             */
-            int mappedStartCol = seq.findIndex(mappedStartResidue) - 1;
-            minStartCol = minStartCol == -1 ? mappedStartCol
-                    : Math.min(minStartCol, mappedStartCol);
-            int mappedEndCol = seq.findIndex(mappedEndResidue) - 1;
-            maxEndCol = maxEndCol == -1 ? mappedEndCol
-                    : Math.max(maxEndCol, mappedEndCol);
-            mappedGroup.addSequence(seq, false);
-            break;
+              /*
+               * Find the mapped aligned columns, save the range. Note findIndex
+               * returns a base 1 position, SequenceGroup uses base 0
+               */
+              int mappedStartCol = seq.findIndex(mappedStartResidue) - 1;
+              minStartCol = minStartCol == -1 ? mappedStartCol
+                      : Math.min(minStartCol, mappedStartCol);
+              int mappedEndCol = seq.findIndex(mappedEndResidue) - 1;
+              maxEndCol = maxEndCol == -1 ? mappedEndCol
+                      : Math.max(maxEndCol, mappedEndCol);
+              mappedGroup.addSequence(seq, false);
+              break;
+            }
           }
         }
       }
@@ -446,18 +452,21 @@ public final class MappingUtils
     {
       for (AlignedCodonFrame acf : mappings)
       {
-        SequenceI mappedSeq = mappingToNucleotide ? acf.getDnaForAaSeq(seq)
-                : acf.getAaForDnaSeq(seq);
-        if (mappedSeq != null)
+        for (SequenceI seq2 : mapTo.getSequences())
         {
-          for (SequenceI seq2 : mapTo.getSequences())
+          /*
+           * the corresponding peptide / CDS is the one for which there is
+           * a complete ('covering') mapping to 'seq'
+           */
+          SequenceI peptide = mappingToNucleotide ? seq2 : seq;
+          SequenceI cds = mappingToNucleotide ? seq : seq2;
+          SequenceToSequenceMapping s2s = acf.getCoveringMapping(cds,
+                  peptide);
+          if (s2s != null)
           {
-            if (seq2.getDatasetSequence() == mappedSeq)
-            {
-              mappedOrder.add(seq2);
-              j++;
-              break;
-            }
+            mappedOrder.add(seq2);
+            j++;
+            break;
           }
         }
       }
@@ -521,7 +530,7 @@ public final class MappingUtils
 
     if (colsel == null)
     {
-      return; // mappedColumns;
+      return;
     }
 
     char fromGapChar = mapFrom.getAlignment().getGapCharacter();
@@ -545,7 +554,7 @@ public final class MappingUtils
       mapHiddenColumns(regions.next(), codonFrames, newHidden,
               fromSequences, toSequences, fromGapChar);
     }
-    return; // mappedColumns;
+    return;
   }
 
   /**
@@ -663,7 +672,9 @@ public final class MappingUtils
          */
         for (SequenceI toSeq : toSequences)
         {
-          if (toSeq.getDatasetSequence() == mappedSeq)
+          if (toSeq.getDatasetSequence() == mappedSeq
+                  && mappedStartResidue >= toSeq.getStart()
+                  && mappedEndResidue <= toSeq.getEnd())
           {
             int mappedStartCol = toSeq.findIndex(mappedStartResidue);
             int mappedEndCol = toSeq.findIndex(mappedEndResidue);
@@ -832,7 +843,7 @@ public final class MappingUtils
     {
       if (range.length % 2 != 0)
       {
-        Cache.log.error(
+        Console.error(
                 "Error unbalance start/end ranges: " + ranges.toString());
         return 0;
       }
@@ -988,7 +999,7 @@ public final class MappingUtils
         /*
          * not coded for [start1, end1, start2, end2, ...]
          */
-        Cache.log.error(
+        Console.error(
                 "MappingUtils.removeEndPositions doesn't handle multiple  ranges");
         return;
       }
@@ -999,7 +1010,7 @@ public final class MappingUtils
         /*
          * not coded for a reverse strand range (end < start)
          */
-        Cache.log.error(
+        Console.error(
                 "MappingUtils.removeEndPositions doesn't handle reverse strand");
         return;
       }
@@ -1098,4 +1109,21 @@ public final class MappingUtils
 
     return foundStart && to >= from ? new int[] { from, to } : null;
   }
+    
+  public static <K, V> Map<K, V> putWithDuplicationCheck(Map<K, V> map, K key,
+          V value)
+  {
+    if (!map.containsKey(key))
+    {
+      map.put(key, value);
+    }
+    else
+    {
+      Console.warn(
+              "Attempt to add duplicate entry detected for map with key: "
+                      + key.toString() + " and value: " + value.toString());
+    }
+  
+    return map;
+  }
 }