X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FSequenceFeatures.java;h=8f6d49697eef4dc5abf315fb71569ce620a38737;hb=8eaa775e59bf928f8899f9ada5c9811200c2853a;hp=c825761791e47e998421c490ba7066997fafcc9f;hpb=6087bb8bd9e7b0291beb99af79e35f4fe189cea2;p=jalview.git

diff --git a/src/jalview/datamodel/features/SequenceFeatures.java b/src/jalview/datamodel/features/SequenceFeatures.java
index c825761..8f6d496 100644
--- a/src/jalview/datamodel/features/SequenceFeatures.java
+++ b/src/jalview/datamodel/features/SequenceFeatures.java
@@ -1,15 +1,20 @@
 package jalview.datamodel.features;
 
+import jalview.datamodel.ContiguousI;
 import jalview.datamodel.SequenceFeature;
+import jalview.io.gff.SequenceOntologyFactory;
+import jalview.io.gff.SequenceOntologyI;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * A class that stores sequence features in a way that supports efficient
@@ -21,6 +26,29 @@ import java.util.Set;
  */
 public class SequenceFeatures implements SequenceFeaturesI
 {
+  /**
+   * a comparator for sorting features by start position ascending
+   */
+  private static Comparator<ContiguousI> FORWARD_STRAND = new Comparator<ContiguousI>()
+  {
+    @Override
+    public int compare(ContiguousI o1, ContiguousI o2)
+    {
+      return Integer.compare(o1.getBegin(), o2.getBegin());
+    }
+  };
+
+  /**
+   * a comparator for sorting features by end position descending
+   */
+  private static Comparator<ContiguousI> REVERSE_STRAND = new Comparator<ContiguousI>()
+  {
+    @Override
+    public int compare(ContiguousI o1, ContiguousI o2)
+    {
+      return Integer.compare(o2.getEnd(), o1.getEnd());
+    }
+  };
 
   /*
    * map from feature type to structured store of features for that type
@@ -33,7 +61,28 @@ public class SequenceFeatures implements SequenceFeaturesI
    */
   public SequenceFeatures()
   {
-    featureStore = new HashMap<String, FeatureStore>();
+    /*
+     * use a TreeMap so that features are returned in alphabetical order of type
+     * ? wrap as a synchronized map for add and delete operations
+     */
+    // featureStore = Collections
+    // .synchronizedSortedMap(new TreeMap<String, FeatureStore>());
+    featureStore = new TreeMap<String, FeatureStore>();
+  }
+
+  /**
+   * Constructor given a list of features
+   */
+  public SequenceFeatures(List<SequenceFeature> features)
+  {
+    this();
+    if (features != null)
+    {
+      for (SequenceFeature feature : features)
+      {
+        add(feature);
+      }
+    }
   }
 
   /**
@@ -43,6 +92,11 @@ public class SequenceFeatures implements SequenceFeaturesI
   public boolean add(SequenceFeature sf)
   {
     String type = sf.getType();
+    if (type == null)
+    {
+      System.err.println("Feature type may not be null: " + sf.toString());
+      return false;
+    }
 
     if (featureStore.get(type) == null)
     {
@@ -82,7 +136,7 @@ public class SequenceFeatures implements SequenceFeaturesI
 
     result.addAll(getPositionalFeatures(type));
 
-    result.addAll(getNonPositionalFeatures(type));
+    result.addAll(getNonPositionalFeatures());
 
     return result;
   }
@@ -91,6 +145,22 @@ public class SequenceFeatures implements SequenceFeaturesI
    * {@inheritDoc}
    */
   @Override
+  public List<SequenceFeature> getFeaturesByOntology(String... ontologyTerm)
+  {
+    if (ontologyTerm == null || ontologyTerm.length == 0)
+    {
+      return new ArrayList<SequenceFeature>();
+    }
+
+    Set<String> featureTypes = getFeatureTypes(ontologyTerm);
+    return getAllFeatures(featureTypes.toArray(new String[featureTypes
+            .size()]));
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
   public int getFeatureCount(boolean positional, String... type)
   {
     int result = 0;
@@ -155,8 +225,23 @@ public class SequenceFeatures implements SequenceFeaturesI
    */
   protected Iterable<String> varargToTypes(String... type)
   {
-    return type == null || type.length == 0 ? featureStore
-            .keySet() : Arrays.asList(type);
+    if (type == null || type.length == 0)
+    {
+      /*
+       * no vararg parameter supplied
+       */
+      return featureStore.keySet();
+    }
+
+    /*
+     * else make a copy of the list, and remove any null value just in case,
+     * as it would cause errors looking up the features Map
+     * sort in alphabetical order for consistent output behaviour
+     */
+    List<String> types = new ArrayList<String>(Arrays.asList(type));
+    types.remove(null);
+    Collections.sort(types);
+    return types;
   }
 
   /**
@@ -285,28 +370,50 @@ public class SequenceFeatures implements SequenceFeaturesI
    * {@inheritDoc}
    */
   @Override
-  public Set<String> getFeatureTypes()
+  public Set<String> getFeatureTypes(String... soTerm)
   {
     Set<String> types = new HashSet<String>();
     for (Entry<String, FeatureStore> entry : featureStore.entrySet())
     {
-      if (!entry.getValue().isEmpty())
+      String type = entry.getKey();
+      if (!entry.getValue().isEmpty() && isOntologyTerm(type, soTerm))
       {
-        types.add(entry.getKey());
+        types.add(type);
       }
     }
     return types;
   }
 
   /**
-   * Answers the minimum score held for positional or non-positional features
-   * for the specified type. This may be Float.NaN if there are no features, or
-   * none has a non-NaN score.
+   * Answers true if the given type is one of the specified sequence ontology
+   * terms (or a sub-type of one), or if no terms are supplied. Answers false if
+   * filter terms are specified and the given term does not match any of them.
    * 
    * @param type
-   * @param positional
+   * @param soTerm
    * @return
    */
+  protected boolean isOntologyTerm(String type, String... soTerm)
+  {
+    if (soTerm == null || soTerm.length == 0)
+    {
+      return true;
+    }
+    SequenceOntologyI so = SequenceOntologyFactory.getInstance();
+    for (String term : soTerm)
+    {
+      if (so.isA(type, term))
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
   public float getMinimumScore(String type, boolean positional)
   {
     return featureStore.containsKey(type) ? featureStore.get(type)
@@ -314,17 +421,74 @@ public class SequenceFeatures implements SequenceFeaturesI
   }
 
   /**
-   * Answers the maximum score held for positional or non-positional features
-   * for the specified type. This may be Float.NaN if there are no features, or
-   * none has a non-NaN score.
-   * 
-   * @param type
-   * @param positional
-   * @return
+   * {@inheritDoc}
    */
+  @Override
   public float getMaximumScore(String type, boolean positional)
   {
     return featureStore.containsKey(type) ? featureStore.get(type)
             .getMaximumScore(positional) : Float.NaN;
   }
-}
+
+  /**
+   * A convenience method to sort features by start position ascending (if on
+   * forward strand), or end position descending (if on reverse strand)
+   * 
+   * @param features
+   * @param forwardStrand
+   */
+  public static void sortFeatures(List<SequenceFeature> features,
+          final boolean forwardStrand)
+  {
+    Collections.sort(features, forwardStrand ? FORWARD_STRAND
+            : REVERSE_STRAND);
+  }
+
+  /**
+   * {@inheritDoc} This method is 'semi-optimised': it only inspects features
+   * for types that include the specified group, but has to inspect every
+   * feature of those types for matching feature group. This is efficient unless
+   * a sequence has features that share the same type but are in different
+   * groups - an unlikely case.
+   * <p>
+   * For example, if RESNUM feature is created with group = PDBID, then features
+   * would only be retrieved for those sequences associated with the target
+   * PDBID (group).
+   */
+  @Override
+  public List<SequenceFeature> getFeaturesForGroup(boolean positional,
+          String group, String... type)
+  {
+    List<SequenceFeature> result = new ArrayList<SequenceFeature>();
+    Iterable<String> types = varargToTypes(type);
+
+    for (String featureType : types)
+    {
+      /*
+       * check whether the feature type is present, and also
+       * whether it has features for the specified group
+       */
+      FeatureStore features = featureStore.get(featureType);
+      if (features != null
+              && features.getFeatureGroups(positional).contains(group))
+      {
+        result.addAll(features.getFeaturesForGroup(positional, group));
+      }
+    }
+    return result;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public boolean shiftFeatures(int shift)
+  {
+    boolean modified = false;
+    for (FeatureStore fs : featureStore.values())
+    {
+      modified |= fs.shiftFeatures(shift);
+    }
+    return modified;
+  }
+}
\ No newline at end of file