X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2Ffeatures%2FSequenceFeatures.java;h=905fd8b4ce4677d77a7f7db8f2ee8d0ad8c9483f;hb=15a605b8a12026b453e252477b416b2c82b6344a;hp=f1e8dd9b3ffd6fc1a9def8bbeb0e155b68fb37b5;hpb=58242624a72b103d2cd6b130d2efb7d57cf5f104;p=jalview.git
diff --git a/src/jalview/datamodel/features/SequenceFeatures.java b/src/jalview/datamodel/features/SequenceFeatures.java
index f1e8dd9..905fd8b 100644
--- a/src/jalview/datamodel/features/SequenceFeatures.java
+++ b/src/jalview/datamodel/features/SequenceFeatures.java
@@ -1,14 +1,27 @@
+/*
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
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.Collections;
-import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -16,6 +29,11 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
+import intervalstore.api.IntervalI;
+import jalview.datamodel.SequenceFeature;
+import jalview.io.gff.SequenceOntologyFactory;
+import jalview.io.gff.SequenceOntologyI;
+
/**
* A class that stores sequence features in a way that supports efficient
* querying by type and location (overlap). Intended for (but not limited to)
@@ -26,30 +44,6 @@ import java.util.TreeMap;
*/
public class SequenceFeatures implements SequenceFeaturesI
{
- /**
- * a comparator for sorting features by start position ascending
- */
- private static Comparator FORWARD_STRAND = new Comparator()
- {
- @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 REVERSE_STRAND = new Comparator()
- {
- @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
* null types are permitted (but not a good idea!)
@@ -67,7 +61,7 @@ public class SequenceFeatures implements SequenceFeaturesI
*/
// featureStore = Collections
// .synchronizedSortedMap(new TreeMap());
- featureStore = new TreeMap();
+ featureStore = new TreeMap<>();
}
/**
@@ -157,8 +151,8 @@ public class SequenceFeatures implements SequenceFeaturesI
return new ArrayList<>();
}
- return getAllFeatures(featureTypes.toArray(new String[featureTypes
- .size()]));
+ return getAllFeatures(
+ featureTypes.toArray(new String[featureTypes.size()]));
}
/**
@@ -208,7 +202,9 @@ public class SequenceFeatures implements SequenceFeaturesI
/**
* A convenience method that converts a vararg for feature types to an
- * Iterable over matched feature sets in key order
+ * Iterable over matched feature sets. If no types are specified, all feature
+ * sets are returned. If one or more types are specified, feature sets for
+ * those types are returned, preserving the order of the types.
*
* @param type
* @return
@@ -224,12 +220,11 @@ public class SequenceFeatures implements SequenceFeaturesI
}
List types = new ArrayList<>();
- List args = Arrays.asList(type);
- for (Entry featureType : featureStore.entrySet())
+ for (String theType : type)
{
- if (args.contains(featureType.getKey()))
+ if (theType != null && featureStore.containsKey(theType))
{
- types.add(featureType.getValue());
+ types.add(featureStore.get(theType));
}
}
return types;
@@ -325,8 +320,8 @@ public class SequenceFeatures implements SequenceFeaturesI
for (Entry featureType : featureStore.entrySet())
{
- Set featureGroups = featureType.getValue().getFeatureGroups(
- positionalFeatures);
+ Set featureGroups = featureType.getValue()
+ .getFeatureGroups(positionalFeatures);
for (String group : groups)
{
if (featureGroups.contains(group))
@@ -362,9 +357,10 @@ public class SequenceFeatures implements SequenceFeaturesI
}
/**
- * 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.
+ * Answers true if the given type matches one of the specified terms (or is a
+ * sub-type of one in the Sequence Ontology), 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 soTerm
@@ -379,7 +375,7 @@ public class SequenceFeatures implements SequenceFeaturesI
SequenceOntologyI so = SequenceOntologyFactory.getInstance();
for (String term : soTerm)
{
- if (so.isA(type, term))
+ if (type.equals(term) || so.isA(type, term))
{
return true;
}
@@ -393,8 +389,9 @@ public class SequenceFeatures implements SequenceFeaturesI
@Override
public float getMinimumScore(String type, boolean positional)
{
- return featureStore.containsKey(type) ? featureStore.get(type)
- .getMinimumScore(positional) : Float.NaN;
+ return featureStore.containsKey(type)
+ ? featureStore.get(type).getMinimumScore(positional)
+ : Float.NaN;
}
/**
@@ -403,8 +400,9 @@ public class SequenceFeatures implements SequenceFeaturesI
@Override
public float getMaximumScore(String type, boolean positional)
{
- return featureStore.containsKey(type) ? featureStore.get(type)
- .getMaximumScore(positional) : Float.NaN;
+ return featureStore.containsKey(type)
+ ? featureStore.get(type).getMaximumScore(positional)
+ : Float.NaN;
}
/**
@@ -414,11 +412,12 @@ public class SequenceFeatures implements SequenceFeaturesI
* @param features
* @param forwardStrand
*/
- public static void sortFeatures(List features,
+ public static void sortFeatures(List extends IntervalI> features,
final boolean forwardStrand)
{
- Collections.sort(features, forwardStrand ? FORWARD_STRAND
- : REVERSE_STRAND);
+ Collections.sort(features,
+ forwardStrand ? IntervalI.COMPARE_BEGIN_ASC_END_DESC
+ : IntervalI.COMPARE_END_DESC);
}
/**