import jalview.datamodel.SequenceFeature;
import jalview.io.gff.SequenceOntologyFactory;
import jalview.io.gff.SequenceOntologyI;
-import jalview.util.Platform;
import java.util.ArrayList;
import java.util.Arrays;
* map from feature type to structured store of features for that type
* null types are permitted (but not a good idea!)
*/
- private Map<String, FeatureStoreI> featureStore;
-
- private static boolean useIntervalStore = !Platform.isJS();
+ private Map<String, FeatureStore> featureStore;
/**
* Constructor
* ? wrap as a synchronized map for add and delete operations
*/
// featureStore = Collections
- // .synchronizedSortedMap(new TreeMap<String, FeatureStoreI>());
+ // .synchronizedSortedMap(new TreeMap<String, FeatureStore>());
featureStore = new TreeMap<>();
}
if (featureStore.get(type) == null)
{
- featureStore.put(type, newFeatureStore());
+ featureStore.put(type, new FeatureStore());
}
return featureStore.get(type).addFeature(sf);
}
- private FeatureStoreI newFeatureStore()
- {
- // TODO Auto-generated method stub
- return (useIntervalStore ? new FeatureStoreImpl() : new FeatureStoreJS());
- }
-
/**
* {@inheritDoc}
*/
String... type)
{
List<SequenceFeature> result = new ArrayList<>();
- for (FeatureStoreI featureSet : varargToTypes(type))
+
+ for (FeatureStore featureSet : varargToTypes(type))
{
-// System.err.println("SF findFeature " + System.currentTimeMillis()
-// + " " + from + " " + to + " "
-// + featureSet.getPositionalFeatures().get(0).type);
-//
- result.addAll(featureSet.findOverlappingFeatures(from, to, null));
+ result.addAll(featureSet.findOverlappingFeatures(from, to));
}
+
return result;
}
{
int result = 0;
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
result += featureSet.getFeatureCount(positional);
}
{
int result = 0;
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
result += featureSet.getTotalFeatureLength();
}
{
List<SequenceFeature> result = new ArrayList<>();
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
- featureSet.getPositionalFeatures(result);
+ result.addAll(featureSet.getPositionalFeatures());
}
return result;
}
* @param type
* @return
*/
- protected Iterable<FeatureStoreI> varargToTypes(String... type)
+ protected Iterable<FeatureStore> varargToTypes(String... type)
{
if (type == null || type.length == 0)
{
return featureStore.values();
}
-
- List<FeatureStoreI> types = new ArrayList<>();
+ List<FeatureStore> types = new ArrayList<>();
List<String> args = Arrays.asList(type);
- for (Entry<String, FeatureStoreI> featureType : featureStore.entrySet())
+ for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
{
if (args.contains(featureType.getKey()))
{
{
List<SequenceFeature> result = new ArrayList<>();
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
- featureSet.getContactFeatures(result);
+ result.addAll(featureSet.getContactFeatures());
}
return result;
}
{
List<SequenceFeature> result = new ArrayList<>();
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
- featureSet.getNonPositionalFeatures(result);
+ result.addAll(featureSet.getNonPositionalFeatures());
}
return result;
}
@Override
public boolean delete(SequenceFeature sf)
{
- for (FeatureStoreI featureSet : featureStore.values())
+ for (FeatureStore featureSet : featureStore.values())
{
if (featureSet.delete(sf))
{
@Override
public boolean hasFeatures()
{
- for (FeatureStoreI featureSet : featureStore.values())
+ for (FeatureStore featureSet : featureStore.values())
{
if (!featureSet.isEmpty())
{
{
Set<String> groups = new HashSet<>();
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
groups.addAll(featureSet.getFeatureGroups(positionalFeatures));
}
{
Set<String> result = new HashSet<>();
- for (Entry<String, FeatureStoreI> featureType : featureStore.entrySet())
+ for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
{
Set<String> featureGroups = featureType.getValue().getFeatureGroups(
positionalFeatures);
public Set<String> getFeatureTypes(String... soTerm)
{
Set<String> types = new HashSet<>();
- for (Entry<String, FeatureStoreI> entry : featureStore.entrySet())
+ for (Entry<String, FeatureStore> entry : featureStore.entrySet())
{
String type = entry.getKey();
if (!entry.getValue().isEmpty() && isOntologyTerm(type, soTerm))
{
return true;
}
- SequenceOntologyI so = SequenceOntologyFactory.getSequenceOntology();
+ SequenceOntologyI so = SequenceOntologyFactory.getInstance();
for (String term : soTerm)
{
if (type.equals(term) || so.isA(type, term))
String group, String... type)
{
List<SequenceFeature> result = new ArrayList<>();
- for (FeatureStoreI featureSet : varargToTypes(type))
+ for (FeatureStore featureSet : varargToTypes(type))
{
if (featureSet.getFeatureGroups(positional).contains(group))
{
public boolean shiftFeatures(int fromPosition, int shiftBy)
{
boolean modified = false;
- for (FeatureStoreI fs : featureStore.values())
+ for (FeatureStore fs : featureStore.values())
{
modified |= fs.shiftFeatures(fromPosition, shiftBy);
}
{
featureStore.clear();
}
-
- /**
- * Simplified find for features associated with a given position.
- *
- * JavaScript set to not use IntervalI, but easily testable by setting false
- * to true in javadoc
- *
- * FeatureRenderer has checked already that featureStore does contain type.
- *
- * @author Bob Hanson 2019.07.30
- */
- @Override
- public List<SequenceFeature> findFeatures(int pos, String type,
- List<SequenceFeature> list)
- {
- FeatureStoreI fs = featureStore.get(type);
- return fs.findOverlappingFeatures(pos, pos, list);
- }
-
- // Chrome; developer console closed
-
- // BH 2019.08.01 useIntervalStore true, redraw false:
- // Platform: timer mark 13.848 0.367 overviewrender 16000 pixels row:14
- // Platform: timer mark 15.391 0.39 overviewrender 16000 pixels row:14
- // Platform: timer mark 16.498 0.39 overviewrender 16000 pixels row:14
- // Platform: timer mark 17.596 0.401 overviewrender 16000 pixels row:14
- // Platform: timer mark 18.738 0.363 overviewrender 16000 pixels row:14
- // Platform: timer mark 19.659 0.358 overviewrender 16000 pixels row:14
- // Platform: timer mark 20.737 0.359 overviewrender 16000 pixels row:14
- // Platform: timer mark 21.797 0.391 overviewrender 16000 pixels row:14
- // Platform: timer mark 22.851 0.361 overviewrender 16000 pixels row:14
- // Platform: timer mark 24.019 0.395 overviewrender 16000 pixels row:14
-
- // BH 2019.08.01 useIntervalStore false, redraw false:
- // Platform: timer mark 19.011 0.181 overviewrender 16000 pixels row:14
- // Platform: timer mark 20.311 0.183 overviewrender 16000 pixels row:14
- // Platform: timer mark 21.368 0.175 overviewrender 16000 pixels row:14
- // Platform: timer mark 22.347 0.178 overviewrender 16000 pixels row:14
- // Platform: timer mark 23.605 0.216 overviewrender 16000 pixels row:14
- // Platform: timer mark 24.836 0.191 overviewrender 16000 pixels row:14
- // Platform: timer mark 26.016 0.181 overviewrender 16000 pixels row:14
- // Platform: timer mark 27.278 0.178 overviewrender 16000 pixels row:14
- // Platform: timer mark 28.158 0.181 overviewrender 16000 pixels row:14
- // Platform: timer mark 29.227 0.196 overviewrender 16000 pixels row:14
- // Platform: timer mark 30.1 0.171 overviewrender 16000 pixels row:14
- // Platform: timer mark 31.684 0.196 overviewrender 16000 pixels row:14
- // Platform: timer mark 32.779 0.18 overviewrender 16000 pixels row:14
- // Platform: timer mark 52.355 0.185 overviewrender 16000 pixels row:14
- // Platform: timer mark 53.829 0.186 overviewrender 16000 pixels row:14
-
-
-
- /**
- * @author Bob Hanson 2019.08.01
- */
- @Override
- public boolean hasFeatures(String type)
- {
- return featureStore.containsKey(type);
- }
-
}
git://source.jalview.org / jalview.git / blobdiff