JAL-3383 JAL-3253-applet

[jalview.git] / src / jalview / datamodel / features / SequenceFeatures.java

diff --git a/src/jalview/datamodel/features/SequenceFeatures.java b/src/jalview/datamodel/features/SequenceFeatures.java
index 9925f2b..0baeb19 100644 (file)
--- a/src/jalview/datamodel/features/SequenceFeatures.java
+++ b/src/jalview/datamodel/features/SequenceFeatures.java
@@ -23,6 +23,7 @@ package jalview.datamodel.features;
 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;
@@ -50,7 +51,9 @@ public class SequenceFeatures implements SequenceFeaturesI
    * map from feature type to structured store of features for that type
    * null types are permitted (but not a good idea!)
    */
-  private Map<String, FeatureStore> featureStore;
+  private Map<String, FeatureStoreI> featureStore;
+
+  private static boolean useIntervalStore = !Platform.isJS();
 
   /**
    * Constructor
@@ -62,7 +65,7 @@ public class SequenceFeatures implements SequenceFeaturesI
      * ? wrap as a synchronized map for add and delete operations
      */
     // featureStore = Collections
-    // .synchronizedSortedMap(new TreeMap<String, FeatureStore>());
+    // .synchronizedSortedMap(new TreeMap<String, FeatureStoreI>());
     featureStore = new TreeMap<>();
   }
 
@@ -96,11 +99,17 @@ public class SequenceFeatures implements SequenceFeaturesI
 
     if (featureStore.get(type) == null)
     {
-      featureStore.put(type, new FeatureStore());
+      featureStore.put(type, newFeatureStore());
     }
     return featureStore.get(type).addFeature(sf);
   }
 
+  private FeatureStoreI newFeatureStore()
+  {
+    // TODO Auto-generated method stub
+    return (useIntervalStore ? new FeatureStoreImpl() : new FeatureStoreJS());
+  }
+
   /**
    * {@inheritDoc}
    */
@@ -109,12 +118,14 @@ public class SequenceFeatures implements SequenceFeaturesI
           String... type)
   {
     List<SequenceFeature> result = new ArrayList<>();
-
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
-      result.addAll(featureSet.findOverlappingFeatures(from, to));
+//      System.err.println("SF findFeature " + System.currentTimeMillis()
+//              + " " + from + " " + to + " "
+//              + featureSet.getPositionalFeatures().get(0).type);
+//
+      result.addAll(featureSet.findOverlappingFeatures(from, to, null));
     }
-
     return result;
   }
 
@@ -165,7 +176,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     int result = 0;
 
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
       result += featureSet.getFeatureCount(positional);
     }
@@ -180,7 +191,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     int result = 0;
 
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
       result += featureSet.getTotalFeatureLength();
     }
@@ -195,9 +206,9 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     List<SequenceFeature> result = new ArrayList<>();
 
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
-      result.addAll(featureSet.getPositionalFeatures());
+      featureSet.getPositionalFeatures(result);
     }
     return result;
   }
@@ -209,7 +220,7 @@ public class SequenceFeatures implements SequenceFeaturesI
    * @param type
    * @return
    */
-  protected Iterable<FeatureStore> varargToTypes(String... type)
+  protected Iterable<FeatureStoreI> varargToTypes(String... type)
   {
     if (type == null || type.length == 0)
     {
@@ -219,9 +230,10 @@ public class SequenceFeatures implements SequenceFeaturesI
       return featureStore.values();
     }
 
-    List<FeatureStore> types = new ArrayList<>();
+
+    List<FeatureStoreI> types = new ArrayList<>();
     List<String> args = Arrays.asList(type);
-    for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
+    for (Entry<String, FeatureStoreI> featureType : featureStore.entrySet())
     {
       if (args.contains(featureType.getKey()))
       {
@@ -239,9 +251,9 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     List<SequenceFeature> result = new ArrayList<>();
 
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
-      result.addAll(featureSet.getContactFeatures());
+      featureSet.getContactFeatures(result);
     }
     return result;
   }
@@ -254,9 +266,9 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     List<SequenceFeature> result = new ArrayList<>();
 
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
-      result.addAll(featureSet.getNonPositionalFeatures());
+      featureSet.getNonPositionalFeatures(result);
     }
     return result;
   }
@@ -267,7 +279,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   @Override
   public boolean delete(SequenceFeature sf)
   {
-    for (FeatureStore featureSet : featureStore.values())
+    for (FeatureStoreI featureSet : featureStore.values())
     {
       if (featureSet.delete(sf))
       {
@@ -283,7 +295,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   @Override
   public boolean hasFeatures()
   {
-    for (FeatureStore featureSet : featureStore.values())
+    for (FeatureStoreI featureSet : featureStore.values())
     {
       if (!featureSet.isEmpty())
       {
@@ -302,7 +314,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     Set<String> groups = new HashSet<>();
 
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
       groups.addAll(featureSet.getFeatureGroups(positionalFeatures));
     }
@@ -319,7 +331,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     Set<String> result = new HashSet<>();
 
-    for (Entry<String, FeatureStore> featureType : featureStore.entrySet())
+    for (Entry<String, FeatureStoreI> featureType : featureStore.entrySet())
     {
       Set<String> featureGroups = featureType.getValue().getFeatureGroups(
               positionalFeatures);
@@ -346,7 +358,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   public Set<String> getFeatureTypes(String... soTerm)
   {
     Set<String> types = new HashSet<>();
-    for (Entry<String, FeatureStore> entry : featureStore.entrySet())
+    for (Entry<String, FeatureStoreI> entry : featureStore.entrySet())
     {
       String type = entry.getKey();
       if (!entry.getValue().isEmpty() && isOntologyTerm(type, soTerm))
@@ -433,7 +445,7 @@ public class SequenceFeatures implements SequenceFeaturesI
           String group, String... type)
   {
     List<SequenceFeature> result = new ArrayList<>();
-    for (FeatureStore featureSet : varargToTypes(type))
+    for (FeatureStoreI featureSet : varargToTypes(type))
     {
       if (featureSet.getFeatureGroups(positional).contains(group))
       {
@@ -450,7 +462,7 @@ public class SequenceFeatures implements SequenceFeaturesI
   public boolean shiftFeatures(int fromPosition, int shiftBy)
   {
     boolean modified = false;
-    for (FeatureStore fs : featureStore.values())
+    for (FeatureStoreI fs : featureStore.values())
     {
       modified |= fs.shiftFeatures(fromPosition, shiftBy);
     }
@@ -465,4 +477,65 @@ public class SequenceFeatures implements SequenceFeaturesI
   {
     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);
+  }
+
 }