X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FFeatureStore.java;h=d832f4de226f8ebeaf2c0a7f3fb23b75a2e098fe;hb=33a853ff07bf9fbdace2744c6c38e28786147e53;hp=3e80966a50b4a9cd3a424750745f9bde3c268d8b;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git

diff --git a/src/jalview/datamodel/features/FeatureStore.java b/src/jalview/datamodel/features/FeatureStore.java
index 3e80966..d832f4d 100644
--- a/src/jalview/datamodel/features/FeatureStore.java
+++ b/src/jalview/datamodel/features/FeatureStore.java
@@ -1,75 +1,153 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview 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 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview 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 Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.datamodel.features;
 
-import jalview.datamodel.ContiguousI;
 import jalview.datamodel.SequenceFeature;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-/**
- * A data store for a set of sequence features that supports efficient lookup of
- * features overlapping a given range. Intended for (but not limited to) storage
- * of features for one sequence and feature type.
- * 
- * @author gmcarstairs
- *
- */
-public class FeatureStore
+public abstract class FeatureStore implements FeatureStoreI
 {
+
   /**
-   * a class providing criteria for performing a binary search of a list
+   * track last start for quick insertion of ordered features
    */
-  abstract static class SearchCriterion
-  {
-    /**
-     * Answers true if the entry passes the search criterion test
-     * 
-     * @param entry
-     * @return
-     */
-    abstract boolean compare(SequenceFeature entry);
+  protected int lastStart = -1, lastContactStart = -1;
 
-    static SearchCriterion byStart(final long target)
+  /**
+   * Answers the 'length' of the feature, counting 0 for non-positional features
+   * and 1 for contact features
+   * 
+   * @param feature
+   * @return
+   */
+  protected static int getFeatureLength(SequenceFeature feature)
+  {
+    if (feature.isNonPositional())
+    {
+      return 0;
+    }
+    if (feature.isContactFeature())
     {
-      return new SearchCriterion() {
+      return 1;
+    }
+    return 1 + feature.getEnd() - feature.getBegin();
+  }
 
-        @Override
-        boolean compare(SequenceFeature entry)
-        {
-          return entry.getBegin() >= target;
-        }
-      };
+  /**
+   * Answers true if the list contains the feature, else false. This method is
+   * optimised for the condition that the list is sorted on feature start
+   * position ascending, and will give unreliable results if this does not hold.
+   * 
+   * @param list
+   * @param feature
+   * @return
+   */
+  @Override
+  public boolean listContains(List<SequenceFeature> list,
+          SequenceFeature feature)
+  {
+    if (list == null || feature == null)
+    {
+      return false;
     }
 
-    static SearchCriterion byEnd(final long target)
+    return (getEquivalentFeatureIndex(list, feature) >= 0);
+  }
+
+  /**
+   * Binary search for the index (&gt;= 0) of a feature in a list.
+   * 
+   * @param list
+   * @param feature
+   * @return index if found; -1 if not
+   */
+  protected int getEquivalentFeatureIndex(List<SequenceFeature> list,
+          SequenceFeature feature)
+  {
+
+    /*
+     * locate the first entry in the list which does not precede the feature
+     */
+    int begin = feature.begin;
+    int pos = findFirstBegin(list, begin);
+    int len = list.size();
+    while (pos < len)
     {
-      return new SearchCriterion()
+      SequenceFeature sf = list.get(pos);
+      if (sf.begin > begin)
       {
-
-        @Override
-        boolean compare(SequenceFeature entry)
-        {
-          return entry.getEnd() >= target;
-        }
-      };
+        return -1; // no match found
+      }
+      if (sf.equals(feature))
+      {
+        return pos;
+      }
+      pos++;
     }
+    return -1;
+  }
 
-    static SearchCriterion byFeature(final ContiguousI to,
-            final Comparator<ContiguousI> rc)
+  /**
+   * A helper method to return the maximum of two floats, where a non-NaN value
+   * is treated as 'greater than' a NaN value (unlike Math.max which does the
+   * opposite)
+   * 
+   * @param f1
+   * @param f2
+   */
+  protected static float max(float f1, float f2)
+  {
+    if (Float.isNaN(f1))
     {
-      return new SearchCriterion()
-      {
+      return Float.isNaN(f2) ? f1 : f2;
+    }
+    else
+    {
+      return Float.isNaN(f2) ? f1 : Math.max(f1, f2);
+    }
+  }
 
-        @Override
-        boolean compare(SequenceFeature entry)
-        {
-          return rc.compare(entry, to) >= 0;
-        }
-      };
+  /**
+   * A helper method to return the minimum of two floats, where a non-NaN value
+   * is treated as 'less than' a NaN value (unlike Math.min which does the
+   * opposite)
+   * 
+   * @param f1
+   * @param f2
+   */
+  protected static float min(float f1, float f2)
+  {
+    if (Float.isNaN(f1))
+    {
+      return Float.isNaN(f2) ? f1 : f2;
+    }
+    else
+    {
+      return Float.isNaN(f2) ? f1 : Math.min(f1, f2);
     }
   }
 
@@ -80,14 +158,6 @@ public class FeatureStore
   List<SequenceFeature> nonPositionalFeatures;
 
   /*
-   * An ordered list of features, with the promise that no feature in the list 
-   * properly contains any other. This constraint allows bounded linear search
-   * of the list for features overlapping a region.
-   * Contact features are not included in this list.
-   */
-  List<SequenceFeature> nonNestedFeatures;
-
-  /*
    * contact features ordered by first contact position
    */
   List<SequenceFeature> contactFeatureStarts;
@@ -98,13 +168,10 @@ public class FeatureStore
   List<SequenceFeature> contactFeatureEnds;
 
   /*
-   * Nested Containment List is used to hold any features that are nested 
-   * within (properly contained by) any other feature. This is a recursive tree
-   * which supports depth-first scan for features overlapping a range.
-   * It is used here as a 'catch-all' fallback for features that cannot be put
-   * into a simple ordered list without invalidating the search methods.
+   * IntervalStore holds remaining features and provides efficient
+   * query for features overlapping any given interval
    */
-  NCList<SequenceFeature> nestedFeatures;
+  Collection<SequenceFeature> features;
 
   /*
    * Feature groups represented in stored positional features 
@@ -137,16 +204,47 @@ public class FeatureStore
    */
   public FeatureStore()
   {
-    nonNestedFeatures = new ArrayList<SequenceFeature>();
-    positionalFeatureGroups = new HashSet<String>();
-    nonPositionalFeatureGroups = new HashSet<String>();
+    positionalFeatureGroups = new HashSet<>();
+    nonPositionalFeatureGroups = new HashSet<>();
     positionalMinScore = Float.NaN;
     positionalMaxScore = Float.NaN;
     nonPositionalMinScore = Float.NaN;
     nonPositionalMaxScore = Float.NaN;
 
-    // we only construct nonPositionalFeatures, contactFeatures
-    // or the NCList if we need to
+    // we only construct nonPositionalFeatures, contactFeatures if we need to
+  }
+
+  /**
+   * Add a contact feature to the lists that hold them ordered by start (first
+   * contact) and by end (second contact) position, ensuring the lists remain
+   * ordered, and returns true. This method allows duplicate features to be
+   * added, so test before calling to avoid this.
+   * 
+   * @param feature
+   * @return
+   */
+  protected synchronized boolean addContactFeature(SequenceFeature feature)
+  {
+    if (contactFeatureStarts == null)
+    {
+      contactFeatureStarts = new ArrayList<>();
+      contactFeatureEnds = new ArrayList<>();
+    }
+
+    /*
+     * insert into list sorted by start (first contact position):
+     * binary search the sorted list to find the insertion point
+     */
+    contactFeatureStarts.add(
+            findFirstBegin(contactFeatureStarts, feature.begin), feature);
+    /*
+     * insert into list sorted by end (second contact position):
+     * binary search the sorted list to find the insertion point
+     */
+    contactFeatureEnds.add(findFirstEnd(contactFeatureEnds, feature.end),
+            feature);
+
+    return true;
   }
 
   /**
@@ -157,8 +255,15 @@ public class FeatureStore
    * 
    * @param feature
    */
+
+  @Override
   public boolean addFeature(SequenceFeature feature)
   {
+    if (contains(feature))
+    {
+      return false;
+    }
+
     /*
      * keep a record of feature groups
      */
@@ -167,89 +272,86 @@ public class FeatureStore
       positionalFeatureGroups.add(feature.getFeatureGroup());
     }
 
-    boolean added = false;
-
     if (feature.isContactFeature())
     {
-      added = addContactFeature(feature);
+      if (feature.begin > lastContactStart)
+      {
+        lastContactStart = feature.begin;
+      }
+      addContactFeature(feature);
     }
     else if (feature.isNonPositional())
     {
-      added = addNonPositionalFeature(feature);
+      addNonPositionalFeature(feature);
     }
     else
     {
-      if (!contains(nonNestedFeatures, feature))
+      addPositionalFeature(feature);
+      if (feature.begin > lastStart)
       {
-        added = addNonNestedFeature(feature);
-        if (!added)
-        {
-          /*
-           * detected a nested feature - put it in the NCList structure
-           */
-          added = addNestedFeature(feature);
-        }
+        lastStart = feature.begin;
       }
     }
 
-    if (added)
+    /*
+     * record the total extent of positional features, to make
+     * getTotalFeatureLength possible; we count the length of a 
+     * contact feature as 1
+     */
+    totalExtent += getFeatureLength(feature);
+
+    /*
+     * record the minimum and maximum score for positional
+     * and non-positional features
+     */
+    float score = feature.getScore();
+    if (!Float.isNaN(score))
     {
-      /*
-       * record the total extent of positional features, to make
-       * getTotalFeatureLength possible; we count the length of a 
-       * contact feature as 1
-       */
-      totalExtent += getFeatureLength(feature);
-
-      /*
-       * record the minimum and maximum score for positional
-       * and non-positional features
-       */
-      float score = feature.getScore();
-      if (!Float.isNaN(score))
+      if (feature.isNonPositional())
       {
-        if (feature.isNonPositional())
-        {
-          nonPositionalMinScore = min(nonPositionalMinScore, score);
-          nonPositionalMaxScore = max(nonPositionalMaxScore, score);
-        }
-        else
-        {
-          positionalMinScore = min(positionalMinScore, score);
-          positionalMaxScore = max(positionalMaxScore, score);
-        }
+        nonPositionalMinScore = min(nonPositionalMinScore, score);
+        nonPositionalMaxScore = max(nonPositionalMaxScore, score);
+      }
+      else
+      {
+        positionalMinScore = min(positionalMinScore, score);
+        positionalMaxScore = max(positionalMaxScore, score);
       }
     }
 
-    return added;
+    return true;
   }
 
-  /**
-   * Answers the 'length' of the feature, counting 0 for non-positional features
-   * and 1 for contact features
-   * 
-   * @param feature
-   * @return
-   */
-  protected static int getFeatureLength(SequenceFeature feature)
+  private void addFeaturesForGroup(String group,
+          Collection<SequenceFeature> sfs, List<SequenceFeature> result)
   {
-    if (feature.isNonPositional())
+    if (sfs == null)
     {
-      return 0;
+      return;
     }
-    if (feature.isContactFeature())
+    for (SequenceFeature sf : sfs)
     {
-      return 1;
+      String featureGroup = sf.getFeatureGroup();
+      if (group == null && featureGroup == null
+              || group != null && group.equals(featureGroup))
+      {
+        result.add(sf);
+      }
     }
-    return 1 + feature.getEnd() - feature.getBegin();
   }
 
   /**
+   * Adds one feature to the IntervalStore that can manage nested features
+   * (creating the IntervalStore if necessary)
+   */
+  abstract protected void addPositionalFeature(SequenceFeature feature);
+
+  /**
    * Adds the feature to the list of non-positional features (with lazy
-   * instantiation of the list if it is null), and returns true. If the
-   * non-positional features already include the new feature (by equality test),
-   * then it is not added, and this method returns false. The feature group is
-   * added to the set of distinct feature groups for non-positional features.
+   * instantiation of the list if it is null), and returns true. The feature
+   * group is added to the set of distinct feature groups for non-positional
+   * features. This method allows duplicate features, so test before calling to
+   * prevent this.
    * 
    * @param feature
    */
@@ -257,11 +359,7 @@ public class FeatureStore
   {
     if (nonPositionalFeatures == null)
     {
-      nonPositionalFeatures = new ArrayList<SequenceFeature>();
-    }
-    if (nonPositionalFeatures.contains(feature))
-    {
-      return false;
+      nonPositionalFeatures = new ArrayList<>();
     }
 
     nonPositionalFeatures.add(feature);
@@ -272,355 +370,273 @@ public class FeatureStore
   }
 
   /**
-   * Adds one feature to the NCList that can manage nested features (creating
-   * the NCList if necessary), and returns true. If the feature is already
-   * stored in the NCList (by equality test), then it is not added, and this
-   * method returns false.
+   * Answers true if this store contains the given feature (testing by
+   * SequenceFeature.equals), else false
+   * 
+   * @param feature
+   * @return
    */
-  protected synchronized boolean addNestedFeature(SequenceFeature feature)
+  @Override
+  public boolean contains(SequenceFeature feature)
   {
-    if (nestedFeatures == null)
+    if (feature.isNonPositional())
+    {
+      return nonPositionalFeatures == null ? false
+              : nonPositionalFeatures.contains(feature);
+    }
+
+    if (feature.isContactFeature())
     {
-      nestedFeatures = new NCList<SequenceFeature>(feature);
-      return true;
+      return contactFeatureStarts != null
+              && feature.begin <= lastContactStart
+              && listContains(contactFeatureStarts, feature);
     }
-    return nestedFeatures.add(feature, false);
+
+    return features == null || feature.begin > lastStart ? false
+            : containsFeature(feature);
   }
 
+
+  abstract protected boolean containsFeature(SequenceFeature feature);
+
   /**
-   * Add a feature to the list of non-nested features, maintaining the ordering
-   * of the list. A check is made for whether the feature is nested in (properly
-   * contained by) an existing feature. If there is no nesting, the feature is
-   * added to the list and the method returns true. If nesting is found, the
-   * feature is not added and the method returns false.
+   * Deletes the given feature from the store, returning true if it was found
+   * (and deleted), else false. This method makes no assumption that the feature
+   * is in the 'expected' place in the store, in case it has been modified since
+   * it was added.
    * 
-   * @param feature
-   * @return
+   * @param sf
    */
-  protected boolean addNonNestedFeature(SequenceFeature feature)
+
+  @Override
+  public synchronized boolean delete(SequenceFeature sf)
   {
-    synchronized (nonNestedFeatures)
+    boolean removed = false;
+
+    /*
+     * try contact positions (and if found, delete
+     * from both lists of contact positions)
+     */
+    if (!removed && contactFeatureStarts != null)
     {
-      /*
-       * find the first stored feature which doesn't precede the new one
-       */
-      int insertPosition = binarySearch(nonNestedFeatures,
-              SearchCriterion.byFeature(feature, RangeComparator.BY_START_POSITION));
-
-      /*
-       * fail if we detect feature enclosure - of the new feature by
-       * the one preceding it, or of the next feature by the new one
-       */
-      if (insertPosition > 0)
-      {
-        if (encloses(nonNestedFeatures.get(insertPosition - 1), feature))
-        {
-          return false;
-        }
-      }
-      if (insertPosition < nonNestedFeatures.size())
+      removed = contactFeatureStarts.remove(sf);
+      if (removed)
       {
-        if (encloses(feature, nonNestedFeatures.get(insertPosition)))
-        {
-          return false;
-        }
+        contactFeatureEnds.remove(sf);
       }
+    }
+
+    /*
+     * if not found, try non-positional features
+     */
+    if (!removed && nonPositionalFeatures != null)
+    {
+      removed = nonPositionalFeatures.remove(sf);
+    }
 
-      /*
-       * checks passed - add the feature
-       */
-      nonNestedFeatures.add(insertPosition, feature);
+    /*
+     * if not found, try nested features
+     */
+    if (!removed && features != null)
+    {
+      removed = findAndRemoveNonContactFeature(sf);
+    }
 
-      return true;
+    if (removed)
+    {
+      rescanAfterDelete();
     }
+
+    return removed;
+  }
+
+  abstract protected boolean findAndRemoveNonContactFeature(SequenceFeature sf);
+
+  abstract protected void findContactFeatures(long from, long to,
+          List<SequenceFeature> result);
+
+  abstract protected int findFirstBegin(List<SequenceFeature> list,
+          long pos);
+
+  abstract protected int findFirstEnd(List<SequenceFeature> list, long pos);
+
+  @Override
+  public List<SequenceFeature> findOverlappingFeatures(long start, long end)
+  {
+    return findOverlappingFeatures(start, end, null);
+  }
+
+  @Override
+  public List<SequenceFeature> getContactFeatures()
+  {
+    return getContactFeatures(new ArrayList<>());
   }
 
   /**
-   * Answers true if range1 properly encloses range2, else false
+   * Answers a list of all contact features. If there are none, returns an
+   * immutable empty list.
    * 
-   * @param range1
-   * @param range2
    * @return
    */
-  protected boolean encloses(ContiguousI range1, ContiguousI range2)
+
+  @Override
+  public List<SequenceFeature> getContactFeatures(
+          List<SequenceFeature> result)
   {
-    int begin1 = range1.getBegin();
-    int begin2 = range2.getBegin();
-    int end1 = range1.getEnd();
-    int end2 = range2.getEnd();
-    if (begin1 == begin2 && end1 > end2)
-    {
-      return true;
-    }
-    if (begin1 < begin2 && end1 >= end2)
+    if (contactFeatureStarts != null)
     {
-      return true;
+      result.addAll(contactFeatureStarts);
     }
-    return false;
+    return result;
   }
 
   /**
-   * Add a contact feature to the lists that hold them ordered by start (first
-   * contact) and by end (second contact) position, ensuring the lists remain
-   * ordered, and returns true. If the contact feature lists already contain the
-   * given feature (by test for equality), does not add it and returns false.
+   * Answers the number of positional (or non-positional) features stored.
+   * Contact features count as 1.
    * 
-   * @param feature
+   * @param positional
    * @return
    */
-  protected synchronized boolean addContactFeature(SequenceFeature feature)
+
+  @Override
+  public int getFeatureCount(boolean positional)
   {
-    if (contactFeatureStarts == null)
-    {
-      contactFeatureStarts = new ArrayList<SequenceFeature>();
-    }
-    if (contactFeatureEnds == null)
+    if (!positional)
     {
-      contactFeatureEnds = new ArrayList<SequenceFeature>();
+      return nonPositionalFeatures == null ? 0
+              : nonPositionalFeatures.size();
     }
 
-    if (contains(contactFeatureStarts, feature))
-    {
-      return false;
-    }
+    return (contactFeatureStarts == null ? 0 : contactFeatureStarts.size())
+            + features.size();
 
-    /*
-     * binary search the sorted list to find the insertion point
-     */
-    int insertPosition = binarySearch(contactFeatureStarts,
-            SearchCriterion.byFeature(feature,
-                    RangeComparator.BY_START_POSITION));
-    contactFeatureStarts.add(insertPosition, feature);
-    // and resort to mak siccar...just in case insertion point not quite right
-    Collections.sort(contactFeatureStarts, RangeComparator.BY_START_POSITION);
-
-    insertPosition = binarySearch(contactFeatureStarts,
-            SearchCriterion.byFeature(feature,
-                    RangeComparator.BY_END_POSITION));
-    contactFeatureEnds.add(feature);
-    Collections.sort(contactFeatureEnds, RangeComparator.BY_END_POSITION);
-
-    return true;
   }
 
   /**
-   * Answers true if the list contains the feature, else false. This method is
-   * optimised for the condition that the list is sorted on feature start
-   * position ascending, and will give unreliable results if this does not hold.
+   * Answers the set of distinct feature groups stored, possibly including null,
+   * as an unmodifiable view of the set. The parameter determines whether the
+   * groups for positional or for non-positional features are returned.
    * 
-   * @param features
-   * @param feature
+   * @param positionalFeatures
    * @return
    */
-  protected static boolean contains(List<SequenceFeature> features,
-          SequenceFeature feature)
+
+  @Override
+  public Set<String> getFeatureGroups(boolean positionalFeatures)
   {
-    if (features == null || feature == null)
+    if (positionalFeatures)
     {
-      return false;
+      return Collections.unmodifiableSet(positionalFeatureGroups);
     }
-
-    /*
-     * locate the first entry in the list which does not precede the feature
-     */
-    int pos = binarySearch(features,
-            SearchCriterion.byFeature(feature, RangeComparator.BY_START_POSITION));
-    int len = features.size();
-    while (pos < len)
+    else
     {
-      SequenceFeature sf = features.get(pos);
-      if (sf.getBegin() > feature.getBegin())
-      {
-        return false; // no match found
-      }
-      if (sf.equals(feature))
-      {
-        return true;
-      }
-      pos++;
+      return nonPositionalFeatureGroups == null
+              ? Collections.<String> emptySet()
+              : Collections.unmodifiableSet(nonPositionalFeatureGroups);
     }
-    return false;
+  }
+
+  @Override
+  public Collection<SequenceFeature> getFeatures()
+  {
+    return features;
   }
 
   /**
-   * Returns a (possibly empty) list of features whose extent overlaps the given
-   * range. The returned list is not ordered. Contact features are included if
-   * either of the contact points lies within the range.
+   * Answers a list of all either positional or non-positional features whose
+   * feature group matches the given group (which may be null)
    * 
-   * @param start
-   *          start position of overlap range (inclusive)
-   * @param end
-   *          end position of overlap range (inclusive)
+   * @param positional
+   * @param group
    * @return
    */
-  public List<SequenceFeature> findOverlappingFeatures(long start, long end)
-  {
-    List<SequenceFeature> result = new ArrayList<SequenceFeature>();
-
-    findNonNestedFeatures(start, end, result);
 
-    findContactFeatures(start, end, result);
+  @Override
+  public List<SequenceFeature> getFeaturesForGroup(boolean positional,
+          String group)
+  {
+    List<SequenceFeature> result = new ArrayList<>();
 
-    if (nestedFeatures != null)
+    /*
+     * if we know features don't include the target group, no need
+     * to inspect them for matches
+     */
+    if (positional && !positionalFeatureGroups.contains(group)
+            || !positional && !nonPositionalFeatureGroups.contains(group))
     {
-      result.addAll(nestedFeatures.findOverlaps(start, end));
+      return result;
     }
 
-    return result;
-  }
-
-  /**
-   * Adds contact features to the result list where either the second or the
-   * first contact position lies within the target range
-   * 
-   * @param from
-   * @param to
-   * @param result
-   */
-  protected void findContactFeatures(long from, long to,
-          List<SequenceFeature> result)
-  {
-    if (contactFeatureStarts != null)
+    if (positional)
     {
-      findContactStartFeatures(from, to, result);
+      addFeaturesForGroup(group, contactFeatureStarts, result);
+      addFeaturesForGroup(group, features, result);
     }
-    if (contactFeatureEnds != null)
+    else
     {
-      findContactEndFeatures(from, to, result);
+      addFeaturesForGroup(group, nonPositionalFeatures, result);
     }
+    return result;
   }
 
   /**
-   * Adds to the result list any contact features whose end (second contact
-   * point), but not start (first contact point), lies in the query from-to
-   * range
+   * Answers the maximum score held for positional or non-positional features.
+   * This may be Float.NaN if there are no features, are none has a non-NaN
+   * score.
    * 
-   * @param from
-   * @param to
-   * @param result
+   * @param positional
+   * @return
    */
-  protected void findContactEndFeatures(long from, long to,
-          List<SequenceFeature> result)
-  {
-    /*
-     * find the first contact feature (if any) that does not lie 
-     * entirely before the target range
-     */
-    int startPosition = binarySearch(contactFeatureEnds,
-            SearchCriterion.byEnd(from));
-    for (; startPosition < contactFeatureEnds.size(); startPosition++)
-    {
-      SequenceFeature sf = contactFeatureEnds.get(startPosition);
-      if (!sf.isContactFeature())
-      {
-        System.err.println("Error! non-contact feature type "
-                + sf.getType() + " in contact features list");
-        continue;
-      }
-
-      int begin = sf.getBegin();
-      if (begin >= from && begin <= to)
-      {
-        /*
-         * this feature's first contact position lies in the search range
-         * so we don't include it in results a second time
-         */
-        continue;
-      }
 
-      int end = sf.getEnd();
-      if (end >= from && end <= to)
-      {
-        result.add(sf);
-      }
-      if (end > to)
-      {
-        break;
-      }
-    }
+  @Override
+  public float getMaximumScore(boolean positional)
+  {
+    return positional ? positionalMaxScore : nonPositionalMaxScore;
   }
 
   /**
-   * Adds non-nested features to the result list that lie within the target
-   * range. Non-positional features (start=end=0), contact features and nested
-   * features are excluded.
+   * Answers the minimum score held for positional or non-positional features.
+   * This may be Float.NaN if there are no features, are none has a non-NaN
+   * score.
    * 
-   * @param from
-   * @param to
-   * @param result
+   * @param positional
+   * @return
    */
-  protected void findNonNestedFeatures(long from, long to,
-          List<SequenceFeature> result)
+
+  @Override
+  public float getMinimumScore(boolean positional)
   {
-    int startIndex = binarySearch(nonNestedFeatures,
-            SearchCriterion.byEnd(from));
+    return positional ? positionalMinScore : nonPositionalMinScore;
+  }
 
-    findNonNestedFeatures(startIndex, from, to, result);
+  @Override
+  public List<SequenceFeature> getNonPositionalFeatures()
+  {
+    return getNonPositionalFeatures(new ArrayList<>());
   }
 
   /**
-   * Scans the list of non-nested features, starting from startIndex, to find
-   * those that overlap the from-to range, and adds them to the result list.
-   * Returns the index of the first feature whose start position is after the
-   * target range (or the length of the whole list if none such feature exists).
+   * Answers a list of all non-positional features. If there are none, returns
+   * an immutable empty list.
    * 
-   * @param startIndex
-   * @param from
-   * @param to
-   * @param result
    * @return
    */
-  protected int findNonNestedFeatures(final int startIndex, long from,
-          long to, List<SequenceFeature> result)
+
+  @Override
+  public List<SequenceFeature> getNonPositionalFeatures(
+          List<SequenceFeature> result)
   {
-    int i = startIndex;
-    while (i < nonNestedFeatures.size())
+    if (nonPositionalFeatures != null)
     {
-      SequenceFeature sf = nonNestedFeatures.get(i);
-      if (sf.getBegin() > to)
-      {
-        break;
-      }
-      int start = sf.getBegin();
-      int end = sf.getEnd();
-      if (start <= to && end >= from)
-      {
-        result.add(sf);
-      }
-      i++;
+      result.addAll(nonPositionalFeatures);
     }
-    return i;
+    return result;
   }
 
-  /**
-   * Adds contact features whose start position lies in the from-to range to the
-   * result list
-   * 
-   * @param from
-   * @param to
-   * @param result
-   */
-  protected void findContactStartFeatures(long from, long to,
-          List<SequenceFeature> result)
+  @Override
+  public List<SequenceFeature> getPositionalFeatures()
   {
-    int startPosition = binarySearch(contactFeatureStarts,
-            SearchCriterion.byStart(from));
-
-    for (; startPosition < contactFeatureStarts.size(); startPosition++)
-    {
-      SequenceFeature sf = contactFeatureStarts.get(startPosition);
-      if (!sf.isContactFeature())
-      {
-        System.err.println("Error! non-contact feature type "
-                + sf.getType() + " in contact features list");
-        continue;
-      }
-      int begin = sf.getBegin();
-      if (begin >= from && begin <= to)
-      {
-        result.add(sf);
-      }
-    }
+    return getPositionalFeatures(new ArrayList<>());
   }
 
   /**
@@ -628,13 +644,11 @@ public class FeatureStore
    * 
    * @return
    */
-  public List<SequenceFeature> getPositionalFeatures()
+
+  @Override
+  public List<SequenceFeature> getPositionalFeatures(
+          List<SequenceFeature> result)
   {
-    /*
-     * add non-nested features (may be all features for many cases)
-     */
-    List<SequenceFeature> result = new ArrayList<SequenceFeature>();
-    result.addAll(nonNestedFeatures);
 
     /*
      * add any contact features - from the list by start position
@@ -647,97 +661,43 @@ public class FeatureStore
     /*
      * add any nested features
      */
-    if (nestedFeatures != null)
+    if (features != null)
     {
-      result.addAll(nestedFeatures.getEntries());
+      result.addAll(features);
     }
 
     return result;
   }
 
   /**
-   * Answers a list of all contact features. If there are none, returns an
-   * immutable empty list.
+   * Answers the total length of positional features (or zero if there are
+   * none). Contact features contribute a value of 1 to the total.
    * 
    * @return
    */
-  public List<SequenceFeature> getContactFeatures()
+
+  @Override
+  public int getTotalFeatureLength()
   {
-    if (contactFeatureStarts == null)
-    {
-      return Collections.emptyList();
-    }
-    return new ArrayList<SequenceFeature>(contactFeatureStarts);
+    return totalExtent;
   }
 
   /**
-   * Answers a list of all non-positional features. If there are none, returns
-   * an immutable empty list.
+   * Answers true if this store has no features, else false
    * 
    * @return
    */
-  public List<SequenceFeature> getNonPositionalFeatures()
-  {
-    if (nonPositionalFeatures == null)
-    {
-      return Collections.emptyList();
-    }
-    return new ArrayList<SequenceFeature>(nonPositionalFeatures);
-  }
 
-  /**
-   * Deletes the given feature from the store, returning true if it was found
-   * (and deleted), else false. This method makes no assumption that the feature
-   * is in the 'expected' place in the store, in case it has been modified since
-   * it was added.
-   * 
-   * @param sf
-   */
-  public synchronized boolean delete(SequenceFeature sf)
+  @Override
+  public boolean isEmpty()
   {
-    /*
-     * try the non-nested positional features first
-     */
-    boolean removed = nonNestedFeatures.remove(sf);
-
-    /*
-     * if not found, try contact positions (and if found, delete
-     * from both lists of contact positions)
-     */
-    if (!removed && contactFeatureStarts != null)
-    {
-      removed = contactFeatureStarts.remove(sf);
-      if (removed)
-      {
-        contactFeatureEnds.remove(sf);
-      }
-    }
-
-    boolean removedNonPositional = false;
-
-    /*
-     * if not found, try non-positional features
-     */
-    if (!removed && nonPositionalFeatures != null)
-    {
-      removedNonPositional = nonPositionalFeatures.remove(sf);
-      removed = removedNonPositional;
-    }
-
-    /*
-     * if not found, try nested features
-     */
-    if (!removed && nestedFeatures != null)
-    {
-      removed = nestedFeatures.delete(sf);
-    }
-
-    if (removed)
-    {
-      rescanAfterDelete();
-    }
+    boolean hasFeatures = (contactFeatureStarts != null
+            && !contactFeatureStarts.isEmpty())
+            || (nonPositionalFeatures != null
+                    && !nonPositionalFeatures.isEmpty())
+            || features.size() > 0;
 
-    return removed;
+    return !hasFeatures;
   }
 
   /**
@@ -754,258 +714,58 @@ public class FeatureStore
     positionalMaxScore = Float.NaN;
     nonPositionalMinScore = Float.NaN;
     nonPositionalMaxScore = Float.NaN;
-
     /*
      * scan non-positional features for groups and scores
      */
-    for (SequenceFeature sf : getNonPositionalFeatures())
+    if (nonPositionalFeatures != null)
     {
-      nonPositionalFeatureGroups.add(sf.getFeatureGroup());
-      float score = sf.getScore();
-      nonPositionalMinScore = min(nonPositionalMinScore, score);
-      nonPositionalMaxScore = max(nonPositionalMaxScore, score);
+      List<SequenceFeature> list = nonPositionalFeatures;
+      for (int i = 0, n = list.size(); i < n; i++)
+      {
+        SequenceFeature sf = list.get(i);
+        nonPositionalFeatureGroups.add(sf.getFeatureGroup());
+        float score = sf.getScore();
+        nonPositionalMinScore = min(nonPositionalMinScore, score);
+        nonPositionalMaxScore = max(nonPositionalMaxScore, score);
+      }
     }
 
     /*
      * scan positional features for groups, scores and extents
      */
-    for (SequenceFeature sf : getPositionalFeatures())
-    {
-      positionalFeatureGroups.add(sf.getFeatureGroup());
-      float score = sf.getScore();
-      positionalMinScore = min(positionalMinScore, score);
-      positionalMaxScore = max(positionalMaxScore, score);
-      totalExtent += getFeatureLength(sf);
-    }
-  }
-
-  /**
-   * A helper method to return the minimum of two floats, where a non-NaN value
-   * is treated as 'less than' a NaN value (unlike Math.min which does the
-   * opposite)
-   * 
-   * @param f1
-   * @param f2
-   */
-  protected static float min(float f1, float f2)
-  {
-    if (Float.isNaN(f1))
-    {
-      return Float.isNaN(f2) ? f1 : f2;
-    }
-    else
-    {
-      return Float.isNaN(f2) ? f1 : Math.min(f1, f2);
-    }
-  }
-
-  /**
-   * A helper method to return the maximum of two floats, where a non-NaN value
-   * is treated as 'greater than' a NaN value (unlike Math.max which does the
-   * opposite)
-   * 
-   * @param f1
-   * @param f2
-   */
-  protected static float max(float f1, float f2)
-  {
-    if (Float.isNaN(f1))
-    {
-      return Float.isNaN(f2) ? f1 : f2;
-    }
-    else
-    {
-      return Float.isNaN(f2) ? f1 : Math.max(f1, f2);
-    }
-  }
-
-  /**
-   * Answers true if this store has no features, else false
-   * 
-   * @return
-   */
-  public boolean isEmpty()
-  {
-    boolean hasFeatures = !nonNestedFeatures.isEmpty()
-            || (contactFeatureStarts != null && !contactFeatureStarts
-                    .isEmpty())
-            || (nonPositionalFeatures != null && !nonPositionalFeatures
-                    .isEmpty())
-            || (nestedFeatures != null && nestedFeatures.size() > 0);
-
-    return !hasFeatures;
-  }
-
-  /**
-   * Answers the set of distinct feature groups stored, possibly including null,
-   * as an unmodifiable view of the set. The parameter determines whether the
-   * groups for positional or for non-positional features are returned.
-   * 
-   * @param positionalFeatures
-   * @return
-   */
-  public Set<String> getFeatureGroups(boolean positionalFeatures)
-  {
-    if (positionalFeatures)
-    {
-      return Collections.unmodifiableSet(positionalFeatureGroups);
-    }
-    else
-    {
-      return nonPositionalFeatureGroups == null ? Collections
-              .<String> emptySet() : Collections
-              .unmodifiableSet(nonPositionalFeatureGroups);
-    }
-  }
-
-  /**
-   * Performs a binary search of the (sorted) list to find the index of the
-   * first entry which returns true for the given comparator function. Returns
-   * the length of the list if there is no such entry.
-   * 
-   * @param features
-   * @param sc
-   * @return
-   */
-  protected static int binarySearch(List<SequenceFeature> features,
-          SearchCriterion sc)
-  {
-    int start = 0;
-    int end = features.size() - 1;
-    int matched = features.size();
-
-    while (start <= end)
-    {
-      int mid = (start + end) / 2;
-      SequenceFeature entry = features.get(mid);
-      boolean compare = sc.compare(entry);
-      if (compare)
-      {
-        matched = mid;
-        end = mid - 1;
-      }
-      else
-      {
-        start = mid + 1;
-      }
-    }
-
-    return matched;
-  }
-
-  /**
-   * Answers the number of positional (or non-positional) features stored.
-   * Contact features count as 1.
-   * 
-   * @param positional
-   * @return
-   */
-  public int getFeatureCount(boolean positional)
-  {
-    if (!positional)
-    {
-      return nonPositionalFeatures == null ? 0 : nonPositionalFeatures
-              .size();
-    }
-
-    int size = nonNestedFeatures.size();
-
-    if (contactFeatureStarts != null)
-    {
-      // note a contact feature (start/end) counts as one
-      size += contactFeatureStarts.size();
-    }
-
-    if (nestedFeatures != null)
-    {
-      size += nestedFeatures.size();
-    }
-
-    return size;
-  }
-
-  /**
-   * Answers the total length of positional features (or zero if there are
-   * none). Contact features contribute a value of 1 to the total.
-   * 
-   * @return
-   */
-  public int getTotalFeatureLength()
-  {
-    return totalExtent;
-  }
-
-  /**
-   * Answers the minimum score held for positional or non-positional features.
-   * This may be Float.NaN if there are no features, are none has a non-NaN
-   * score.
-   * 
-   * @param positional
-   * @return
-   */
-  public float getMinimumScore(boolean positional)
-  {
-    return positional ? positionalMinScore : nonPositionalMinScore;
-  }
 
-  /**
-   * Answers the maximum score held for positional or non-positional features.
-   * This may be Float.NaN if there are no features, are none has a non-NaN
-   * score.
-   * 
-   * @param positional
-   * @return
-   */
-  public float getMaximumScore(boolean positional)
-  {
-    return positional ? positionalMaxScore : nonPositionalMaxScore;
+    rescanPositional(contactFeatureStarts);
+    rescanPositional(features);
   }
 
-  /**
-   * Answers a list of all either positional or non-positional features whose
-   * feature group matches the given group (which may be null)
-   * 
-   * @param positional
-   * @param group
-   * @return
-   */
-  public List<SequenceFeature> getFeaturesForGroup(boolean positional,
-          String group)
+  private void rescanPositional(Collection<SequenceFeature> sfs)
   {
-    List<SequenceFeature> result = new ArrayList<SequenceFeature>();
-
-    /*
-     * if we know features don't include the target group, no need
-     * to inspect them for matches
-     */
-    if (positional && !positionalFeatureGroups.contains(group)
-            || !positional && !nonPositionalFeatureGroups.contains(group))
+    if (sfs == null)
     {
-      return result;
+      return;
     }
-
-    List<SequenceFeature> sfs = positional ? getPositionalFeatures()
-            : getNonPositionalFeatures();
     for (SequenceFeature sf : sfs)
     {
-      String featureGroup = sf.getFeatureGroup();
-      if (group == null && featureGroup == null || group != null
-              && group.equals(featureGroup))
-      {
-        result.add(sf);
-      }
+      positionalFeatureGroups.add(sf.getFeatureGroup());
+      float score = sf.getScore();
+      positionalMinScore = min(positionalMinScore, score);
+      positionalMaxScore = max(positionalMaxScore, score);
+      totalExtent += getFeatureLength(sf);
     }
-    return result;
   }
 
   /**
-   * Adds the shift value to the start and end of all positional features.
-   * Returns true if at least one feature was updated, else false.
+   * Adds the shift amount to the start and end of all positional features whose
+   * start position is at or after fromPosition. Returns true if at least one
+   * feature was shifted, else false.
    * 
-   * @param shift
+   * @param fromPosition
+   * @param shiftBy
    * @return
    */
-  public synchronized boolean shiftFeatures(int shift)
+
+  @Override
+  public synchronized boolean shiftFeatures(int fromPosition, int shiftBy)
   {
     /*
      * Because begin and end are final fields (to ensure the data store's
@@ -1013,24 +773,30 @@ public class FeatureStore
      * (Although a simple shift of all values would preserve data integrity!)
      */
     boolean modified = false;
-    for (SequenceFeature sf : getPositionalFeatures())
+    List<SequenceFeature> list = getPositionalFeatures();
+    for (int i = 0, n = list.size(); i < n; i++)
     {
-      modified = true;
-      int newBegin = sf.getBegin() + shift;
-      int newEnd = sf.getEnd() + shift;
-
-      /*
-       * sanity check: don't shift left of the first residue
-       */
-      if (newEnd > 0)
+      SequenceFeature sf = list.get(i);
+      if (sf.getBegin() >= fromPosition)
       {
-        newBegin = Math.max(1, newBegin);
-        SequenceFeature sf2 = new SequenceFeature(sf, newBegin, newEnd,
-                sf.getFeatureGroup(), sf.getScore());
-        addFeature(sf2);
+        modified = true;
+        int newBegin = sf.getBegin() + shiftBy;
+        int newEnd = sf.getEnd() + shiftBy;
+
+        /*
+         * sanity check: don't shift left of the first residue
+         */
+        if (newEnd > 0)
+        {
+          newBegin = Math.max(1, newBegin);
+          SequenceFeature sf2 = new SequenceFeature(sf, newBegin, newEnd,
+                  sf.getFeatureGroup(), sf.getScore());
+          addFeature(sf2);
+        }
+        delete(sf);
       }
-      delete(sf);
     }
     return modified;
   }
+
 }