X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2Fscoremodels%2FFeatureDistanceModel.java;h=38217e922aa0633089bffccaa105f03f85096ca5;hb=e7921fdc9d6ab87ef91bb7781dd7d9316e671e3f;hp=636c19b3b545760a4d6018dddd7f43da7ee51e25;hpb=8717834368bd00d8adfa47ee099288acd34363ef;p=jalview.git

diff --git a/src/jalview/analysis/scoremodels/FeatureDistanceModel.java b/src/jalview/analysis/scoremodels/FeatureDistanceModel.java
index 636c19b..38217e9 100644
--- a/src/jalview/analysis/scoremodels/FeatureDistanceModel.java
+++ b/src/jalview/analysis/scoremodels/FeatureDistanceModel.java
@@ -22,9 +22,8 @@ package jalview.analysis.scoremodels;
 
 import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
-import jalview.api.analysis.DistanceScoreModelI;
+import jalview.api.analysis.ScoreModelI;
 import jalview.api.analysis.SimilarityParamsI;
-import jalview.api.analysis.ViewBasedAnalysisI;
 import jalview.datamodel.AlignmentView;
 import jalview.datamodel.SeqCigar;
 import jalview.datamodel.SequenceFeature;
@@ -38,13 +37,39 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class FeatureDistanceModel implements DistanceScoreModelI,
-        ViewBasedAnalysisI
+public class FeatureDistanceModel extends DistanceScoreModel
 {
+  private static final String NAME = "Sequence Feature Similarity";
+
+  private String description;
+
   FeatureRenderer fr;
 
+  /**
+   * Constructor
+   */
+  public FeatureDistanceModel()
+  {
+  }
+
   @Override
-  public boolean configureFromAlignmentView(AlignmentViewPanel view)
+  public ScoreModelI getInstance(AlignmentViewPanel view)
+  {
+    FeatureDistanceModel model;
+    try
+    {
+      model = this.getClass().newInstance();
+      model.configureFromAlignmentView(view);
+      return model;
+    } catch (InstantiationException | IllegalAccessException e)
+    {
+      System.err.println("Error in " + getClass().getName()
+              + ".getInstance(): " + e.getMessage());
+      return null;
+    }
+  }
+
+  boolean configureFromAlignmentView(AlignmentViewPanel view)
 
   {
     fr = view.cloneFeatureRenderer();
@@ -57,17 +82,28 @@ public class FeatureDistanceModel implements DistanceScoreModelI,
    * features each sequence pair has at each column, ignore feature types they
    * have in common, and count the rest. The totals are normalised by the number
    * of columns processed.
+   * <p>
+   * The parameters argument provides settings for treatment of gap-residue
+   * aligned positions, and whether the score is over the longer or shorter of
+   * each pair of sequences
+   * 
+   * @param seqData
+   * @param params
    */
   @Override
   public MatrixI findDistances(AlignmentView seqData,
-          SimilarityParamsI options)
+          SimilarityParamsI params)
   {
-    List<String> dft = fr.getDisplayedFeatureTypes();
     SeqCigar[] seqs = seqData.getSequences();
     int noseqs = seqs.length;
     int cpwidth = 0;// = seqData.getWidth();
     double[][] distances = new double[noseqs][noseqs];
-    if (dft.isEmpty())
+    List<String> dft = null;
+    if (fr != null)
+    {
+      dft = fr.getDisplayedFeatureTypes();
+    }
+    if (dft == null || dft.isEmpty())
     {
       return new Matrix(distances);
     }
@@ -86,10 +122,10 @@ public class FeatureDistanceModel implements DistanceScoreModelI,
         cpwidth++;
 
         /*
-         * first pass: record features types in column for each sequence
+         * first record feature types in this column for each sequence
          */
-        Map<SeqCigar, Set<String>> sfap = findFeatureTypesAtColumn(
-                seqs, cpos);
+        Map<SeqCigar, Set<String>> sfap = findFeatureTypesAtColumn(seqs,
+                cpos);
 
         /*
          * count feature types on either i'th or j'th sequence but not both
@@ -99,9 +135,23 @@ public class FeatureDistanceModel implements DistanceScoreModelI,
         {
           for (int j = i + 1; j < noseqs; j++)
           {
-            int seqDistance = SetUtils.countDisjunction(sfap.get(seqs[i]),
-                    sfap.get(seqs[j]));
-            distances[i][j] += seqDistance;
+            SeqCigar sc1 = seqs[i];
+            SeqCigar sc2 = seqs[j];
+            Set<String> set1 = sfap.get(sc1);
+            Set<String> set2 = sfap.get(sc2);
+            boolean gap1 = set1 == null;
+            boolean gap2 = set2 == null;
+
+            /*
+             * gap-gap always scores zero
+             * residue-residue is always scored
+             * include gap-residue score if params say to do so
+             */
+            if ((!gap1 && !gap2) || params.includeGaps())
+            {
+              int seqDistance = SetUtils.countDisjunction(set1, set2);
+              distances[i][j] += seqDistance;
+            }
           }
         }
       }
@@ -125,11 +175,14 @@ public class FeatureDistanceModel implements DistanceScoreModelI,
   }
 
   /**
-   * Builds and returns a list (one per SeqCigar) of visible feature types at
-   * the given column position
+   * Builds and returns a map containing a (possibly empty) list (one per
+   * SeqCigar) of visible feature types at the given column position. The map
+   * does not include entries for features which straddle a gapped column
+   * positions.
    * 
    * @param seqs
    * @param columnPosition
+   *          (0..)
    * @return
    */
   protected Map<SeqCigar, Set<String>> findFeatureTypesAtColumn(
@@ -138,18 +191,21 @@ public class FeatureDistanceModel implements DistanceScoreModelI,
     Map<SeqCigar, Set<String>> sfap = new HashMap<SeqCigar, Set<String>>();
     for (SeqCigar seq : seqs)
     {
-      Set<String> types = new HashSet<String>();
       int spos = seq.findPosition(columnPosition);
       if (spos != -1)
       {
-        List<SequenceFeature> sfs = fr.findFeaturesAtRes(seq.getRefSeq(),
-                spos);
+        /*
+         * position is not a gap
+         */
+        Set<String> types = new HashSet<String>();
+        List<SequenceFeature> sfs = fr.findFeaturesAtResidue(
+                seq.getRefSeq(), spos);
         for (SequenceFeature sf : sfs)
         {
           types.add(sf.getType());
         }
+        sfap.put(seq, types);
       }
-      sfap.put(seq, types);
     }
     return sfap;
   }
@@ -157,7 +213,13 @@ public class FeatureDistanceModel implements DistanceScoreModelI,
   @Override
   public String getName()
   {
-    return "Sequence Feature Similarity";
+    return NAME;
+  }
+
+  @Override
+  public String getDescription()
+  {
+    return description;
   }
 
   @Override