(feature);
- return true;
+ return contactFeatureStarts == null ? false : listContains(
+ contactFeatureStarts, feature);
}
- return nestedFeatures.add(feature, false);
+
+ return features == null ? false : features
+ .contains(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.
- *
- * Contact features are added at the position of their first contact point
+ * Answers the 'length' of the feature, counting 0 for non-positional features
+ * and 1 for contact features
*
* @param feature
* @return
*/
- protected boolean addNonNestedFeature(SequenceFeature feature)
+ protected static int getFeatureLength(SequenceFeature feature)
{
- synchronized (nonNestedFeatures)
+ if (feature.isNonPositional())
{
- int insertPosition = binarySearchForAdd(nonNestedFeatures, feature);
-
- /*
- * 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())
- {
- if (encloses(feature, nonNestedFeatures.get(insertPosition)))
- {
- return false;
- }
- }
-
- /*
- * checks passed - add or append the feature
- */
- if (insertPosition == nonNestedFeatures.size())
- {
- nonNestedFeatures.add(feature);
- }
- else
- {
- nonNestedFeatures.add(insertPosition, feature);
- }
- return true;
+ return 0;
+ }
+ if (feature.isContactFeature())
+ {
+ return 1;
}
+ return 1 + feature.getEnd() - feature.getBegin();
}
/**
- * Answers true if range1 properly encloses range2, else false
+ * Adds the feature to the list of non-positional features (with lazy
+ * 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 range1
- * @param range2
- * @return
+ * @param feature
*/
- protected boolean encloses(ContiguousI range1, ContiguousI range2)
+ protected boolean addNonPositionalFeature(SequenceFeature feature)
{
- 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 (nonPositionalFeatures == null)
{
- return true;
+ nonPositionalFeatures = new ArrayList<>();
}
- return false;
+
+ nonPositionalFeatures.add(feature);
+
+ nonPositionalFeatureGroups.add(feature.getFeatureGroup());
+
+ return true;
}
/**
- * Answers the index of the first element in the given list which follows or
- * matches the given feature in the sort order. If no such element, answers
- * the length of the list.
- *
- * @param list
- * @param feature
- *
- * @return
+ * Adds one feature to the IntervalStore that can manage nested features
+ * (creating the IntervalStore if necessary)
*/
- protected int binarySearchForAdd(List list, SequenceFeature feature)
+ protected synchronized void addNestedFeature(SequenceFeature feature)
{
- // TODO binary search!
- int i = 0;
- while (i < list.size())
+ if (features == null)
{
- if (startOrdering.compare(nonNestedFeatures.get(i), feature) >= 0)
- {
- break;
- }
- i++;
+ features = new IntervalStore<>();
}
- return i;
+ features.add(feature);
}
/**
* 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.
+ * ordered, and returns true. This method allows duplicate features to be
+ * added, so test before calling to avoid this.
*
* @param feature
* @return
@@ -253,29 +265,76 @@ public class FeatureStore
{
if (contactFeatureStarts == null)
{
- contactFeatureStarts = new ArrayList();
+ contactFeatureStarts = new ArrayList<>();
}
if (contactFeatureEnds == null)
{
- contactFeatureEnds = new ArrayList();
+ contactFeatureEnds = new ArrayList<>();
}
- // TODO binary search for insertion points!
- if (contactFeatureStarts.contains(feature))
+ /*
+ * insert into list sorted by start (first contact position):
+ * binary search the sorted list to find the insertion point
+ */
+ int insertPosition = BinarySearcher.findFirst(contactFeatureStarts,
+ true, Compare.GE, feature.getBegin());
+ contactFeatureStarts.add(insertPosition, feature);
+
+
+ /*
+ * insert into list sorted by end (second contact position):
+ * binary search the sorted list to find the insertion point
+ */
+ insertPosition = BinarySearcher.findFirst(contactFeatureEnds,
+ false, Compare.GE, feature.getEnd());
+ contactFeatureEnds.add(insertPosition, feature);
+
+ 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.
+ *
+ * @param features
+ * @param feature
+ * @return
+ */
+ protected static boolean listContains(List features,
+ SequenceFeature feature)
+ {
+ if (features == null || feature == null)
{
return false;
}
- contactFeatureStarts.add(feature);
- Collections.sort(contactFeatureStarts, startOrdering);
- contactFeatureEnds.add(feature);
- Collections.sort(contactFeatureEnds, endOrdering);
-
- return true;
+ /*
+ * 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 pos = BinarySearcher.findFirst(features, true, Compare.GE,
+ feature.getBegin());
+ int len = features.size();
+ while (pos < len)
+ {
+ SequenceFeature sf = features.get(pos);
+ if (sf.getBegin() > feature.getBegin())
+ {
+ return false; // no match found
+ }
+ if (sf.equals(feature))
+ {
+ return true;
+ }
+ pos++;
+ }
+ return false;
}
/**
- * Returns a (possibly empty) list of entries whose range overlaps the given
+ * 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.
*
@@ -287,15 +346,13 @@ public class FeatureStore
*/
public List findOverlappingFeatures(long start, long end)
{
- List result = new ArrayList();
-
- findNonNestedFeatures(start, end, result);
+ List result = new ArrayList<>();
findContactFeatures(start, end, result);
- if (nestedFeatures != null)
+ if (features != null)
{
- result.addAll(nestedFeatures.findOverlaps(start, end));
+ result.addAll(features.findOverlaps(start, end));
}
return result;
@@ -303,7 +360,7 @@ public class FeatureStore
/**
* Adds contact features to the result list where either the second or the
- * first contact position lies within the target range.
+ * first contact position lies within the target range
*
* @param from
* @param to
@@ -314,32 +371,44 @@ public class FeatureStore
{
if (contactFeatureStarts != null)
{
- findContactStartFeatures(from, to, result);
+ findContactStartOverlaps(from, to, result);
}
if (contactFeatureEnds != null)
{
- findContactEndFeatures(from, to, result);
+ findContactEndOverlaps(from, to, 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
+ *
* @param from
* @param to
* @param result
*/
- protected void findContactEndFeatures(long from, long to,
+ protected void findContactEndOverlaps(long from, long to,
List result)
{
- // TODO binary search for startPosition
- for (int startPosition = 0; startPosition < contactFeatureEnds.size(); startPosition++)
+ /*
+ * find the first contact feature (if any)
+ * whose end point is not before the target range
+ */
+ int index = BinarySearcher.findFirst(contactFeatureEnds,
+ false, Compare.GE, (int) from);
+
+ while (index < contactFeatureEnds.size())
{
- SequenceFeature sf = contactFeatureEnds.get(startPosition);
+ SequenceFeature sf = contactFeatureEnds.get(index);
if (!sf.isContactFeature())
{
System.err.println("Error! non-contact feature type "
+ sf.getType() + " in contact features list");
+ index++;
continue;
}
+
int begin = sf.getBegin();
if (begin >= from && begin <= to)
{
@@ -347,120 +416,25 @@ public class FeatureStore
* this feature's first contact position lies in the search range
* so we don't include it in results a second time
*/
+ index++;
continue;
}
- int end = sf.getEnd();
- if (end >= from && end <= to)
- {
- result.add(sf);
- }
- }
- }
-
- /**
- * Returns the index of the first contact feature found whose end (second
- * contact position) is not before the given start position. If no such
- * feature is found, returns the length of the contact features list.
- *
- * @param start
- * @return
- */
- protected int contactsBinarySearch(long start)
- {
- // TODO binary search!!
- int i = 0;
- while (i < contactFeatureEnds.size())
- {
- if (contactFeatureEnds.get(i).getEnd() >= start)
- {
- break;
- }
- i++;
- }
-
- return i;
- }
-
- /**
- * Adds features to the result list that are at a single position which lies
- * within the target range. Non-positional features (start=end=0) and contact
- * features are excluded.
- *
- * @param from
- * @param to
- * @param result
- */
- protected void findNonNestedFeatures(long from, long to,
- List result)
- {
- int startIndex = binarySearch(nonNestedFeatures, from);
- findNonNestedFeatures(startIndex, from, to, result);
- }
- /**
- * 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).
- *
- * @param startIndex
- * @param from
- * @param to
- * @param result
- * @return
- */
- protected int findNonNestedFeatures(final int startIndex, long from,
- long to,
- List result)
- {
- int i = startIndex;
- while (i < nonNestedFeatures.size())
- {
- SequenceFeature sf = nonNestedFeatures.get(i);
- if (sf.getBegin() > to)
+ if (sf.getEnd() > to)
{
+ /*
+ * this feature (and all following) has end point after the target range
+ */
break;
}
- int start = sf.getBegin();
- int end = sf.getEnd();
- if (start <= to && end >= from)
- {
- result.add(sf);
- }
- i++;
- }
- return i;
- }
- /**
- * Performs a binary search of the (sorted) list to find the index of the
- * first entry whose end position is not less than the target position (i.e.
- * skip all features that properly precede the given position)
- *
- * @param features
- * @param target
- * @return
- */
- protected int binarySearch(List features, long target)
- {
- int width = features.size() / 2;
- int lastpos = width;
- while (width > 0)
- {
- int end = features.get(lastpos).getEnd();
- width = width / 2;
- if (end > target)
- {
- lastpos -= width;
- }
- else
- {
- lastpos += width;
- }
+ /*
+ * feature has end >= from and end <= to
+ * i.e. contact end point lies within overlap search range
+ */
+ result.add(sf);
+ index++;
}
- // todo correct binary search
- return lastpos > 1 ? lastpos - 2 : 0;
- // return lastpos;
}
/**
@@ -471,40 +445,47 @@ public class FeatureStore
* @param to
* @param result
*/
- protected void findContactStartFeatures(long from, long to,
+ protected void findContactStartOverlaps(long from, long to,
List result)
{
- // TODO binary search for startPosition
- for (int startPosition = 0; startPosition < contactFeatureStarts.size(); startPosition++)
+ int index = BinarySearcher.findFirst(contactFeatureStarts,
+ true, Compare.GE, (int) from);
+
+ while (index < contactFeatureStarts.size())
{
- SequenceFeature sf = contactFeatureStarts.get(startPosition);
+ SequenceFeature sf = contactFeatureStarts.get(index);
if (!sf.isContactFeature())
{
- System.err.println("Error! non-contact feature type "
- + sf.getType() + " in contact features list");
+ System.err.println("Error! non-contact feature " + sf.toString()
+ + " in contact features list");
+ index++;
continue;
}
- int begin = sf.getBegin();
- if (begin >= from && begin <= to)
+ if (sf.getBegin() > to)
{
- result.add(sf);
+ /*
+ * this feature's start (and all following) follows the target range
+ */
+ break;
}
+
+ /*
+ * feature has begin >= from and begin <= to
+ * i.e. contact start point lies within overlap search range
+ */
+ result.add(sf);
+ index++;
}
}
/**
- * Answers a list of all features stored (including any non-positional
- * features), in no guaranteed order
+ * Answers a list of all positional features stored, in no guaranteed order
*
* @return
*/
- public List getFeatures()
+ public List getPositionalFeatures()
{
- /*
- * add non-nested features (may be all features for many cases)
- */
- List result = new ArrayList();
- result.addAll(nonNestedFeatures);
+ List result = new ArrayList<>();
/*
* add any contact features - from the list by start position
@@ -515,19 +496,11 @@ public class FeatureStore
}
/*
- * add any non-positional features
- */
- if (nonPositionalFeatures != null)
- {
- result.addAll(nonPositionalFeatures);
- }
-
- /*
* add any nested features
*/
- if (nestedFeatures != null)
+ if (features != null)
{
- result.addAll(nestedFeatures.getEntries());
+ result.addAll(features);
}
return result;
@@ -545,7 +518,7 @@ public class FeatureStore
{
return Collections.emptyList();
}
- return new ArrayList(contactFeatureStarts);
+ return new ArrayList<>(contactFeatureStarts);
}
/**
@@ -560,7 +533,7 @@ public class FeatureStore
{
return Collections.emptyList();
}
- return new ArrayList(nonPositionalFeatures);
+ return new ArrayList<>(nonPositionalFeatures);
}
/**
@@ -571,15 +544,12 @@ public class FeatureStore
*
* @param sf
*/
- public boolean delete(SequenceFeature sf)
+ public synchronized boolean delete(SequenceFeature sf)
{
- /*
- * try the non-nested positional features first
- */
- boolean removed = nonNestedFeatures.remove(sf);
+ boolean removed = false;
/*
- * if not found, try contact positions (and if found, delete
+ * try contact positions (and if found, delete
* from both lists of contact positions)
*/
if (!removed && contactFeatureStarts != null)
@@ -591,22 +561,294 @@ public class FeatureStore
}
}
+ boolean removedNonPositional = false;
+
/*
* if not found, try non-positional features
*/
if (!removed && nonPositionalFeatures != null)
{
- removed = nonPositionalFeatures.remove(sf);
+ removedNonPositional = nonPositionalFeatures.remove(sf);
+ removed = removedNonPositional;
}
/*
* if not found, try nested features
*/
- if (!removed && nestedFeatures != null)
+ if (!removed && features != null)
+ {
+ removed = features.remove(sf);
+ }
+
+ if (removed)
{
- removed = nestedFeatures.delete(sf);
+ rescanAfterDelete();
}
return removed;
}
+
+ /**
+ * Rescan all features to recompute any cached values after an entry has been
+ * deleted. This is expected to be an infrequent event, so performance here is
+ * not critical.
+ */
+ protected synchronized void rescanAfterDelete()
+ {
+ positionalFeatureGroups.clear();
+ nonPositionalFeatureGroups.clear();
+ totalExtent = 0;
+ positionalMinScore = Float.NaN;
+ positionalMaxScore = Float.NaN;
+ nonPositionalMinScore = Float.NaN;
+ nonPositionalMaxScore = Float.NaN;
+
+ /*
+ * scan non-positional features for groups and scores
+ */
+ for (SequenceFeature sf : getNonPositionalFeatures())
+ {
+ 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 = (contactFeatureStarts != null
+ && !contactFeatureStarts
+ .isEmpty())
+ || (nonPositionalFeatures != null && !nonPositionalFeatures
+ .isEmpty())
+ || (features != null && features.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 getFeatureGroups(boolean positionalFeatures)
+ {
+ if (positionalFeatures)
+ {
+ return Collections.unmodifiableSet(positionalFeatureGroups);
+ }
+ else
+ {
+ return nonPositionalFeatureGroups == null ? Collections
+ . emptySet() : Collections
+ .unmodifiableSet(nonPositionalFeatureGroups);
+ }
+ }
+
+ /**
+ * 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 = 0;
+
+ if (contactFeatureStarts != null)
+ {
+ // note a contact feature (start/end) counts as one
+ size += contactFeatureStarts.size();
+ }
+
+ if (features != null)
+ {
+ size += features.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;
+ }
+
+ /**
+ * 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 getFeaturesForGroup(boolean positional,
+ String group)
+ {
+ List result = new ArrayList<>();
+
+ /*
+ * 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))
+ {
+ return result;
+ }
+
+ List 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);
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 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 fromPosition
+ * @param shiftBy
+ * @return
+ */
+ public synchronized boolean shiftFeatures(int fromPosition, int shiftBy)
+ {
+ /*
+ * Because begin and end are final fields (to ensure the data store's
+ * integrity), we have to delete each feature and re-add it as amended.
+ * (Although a simple shift of all values would preserve data integrity!)
+ */
+ boolean modified = false;
+ for (SequenceFeature sf : getPositionalFeatures())
+ {
+ if (sf.getBegin() >= fromPosition)
+ {
+ 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);
+ }
+ }
+ return modified;
+ }
}