JAL-2403 improved ScoreModelI hierarchy as per Kira's review suggestions

[jalview.git] / src / jalview / api / analysis / ScoreModelI.java

diff --git a/src/jalview/api/analysis/ScoreModelI.java b/src/jalview/api/analysis/ScoreModelI.java
index 4433cea..6afd483 100644 (file)
--- a/src/jalview/api/analysis/ScoreModelI.java
+++ b/src/jalview/api/analysis/ScoreModelI.java
@@ -1,5 +1,8 @@
 package jalview.api.analysis;
 
+import jalview.datamodel.AlignmentView;
+import jalview.math.MatrixI;
+
 public interface ScoreModelI
 {
   /**
@@ -12,6 +15,15 @@ public interface ScoreModelI
   String getName();
 
   /**
+   * Answers an informative description of the model, suitable for use in
+   * tooltips. Descriptions may be internationalised, and need not be unique
+   * (but should be).
+   * 
+   * @return
+   */
+  String getDescription();
+
+  /**
    * Answers true if this model is applicable for nucleotide data (so should be
    * shown in menus in that context)
    * 
@@ -28,4 +40,29 @@ public interface ScoreModelI
   boolean isProtein();
 
   // TODO getName, isDNA, isProtein can be static methods in Java 8
+
+  /**
+   * Returns a distance score for the given sequence regions, that is, a matrix
+   * whose value [i][j] is the distance of sequence i from sequence j by some
+   * measure. The options parameter provides configuration choices for how the
+   * similarity score is calculated.
+   * 
+   * @param seqData
+   * @param options
+   * @return
+   */
+
+  MatrixI findDistances(AlignmentView seqData, SimilarityParamsI options);
+
+  /**
+   * Returns a similarity score for the given sequence regions, that is, a
+   * matrix whose value [i][j] is the similarity of sequence i to sequence j by
+   * some measure. The options parameter provides configuration choices for how
+   * the similarity score is calculated.
+   * 
+   * @param seqData
+   * @param options
+   * @return
+   */
+  MatrixI findSimilarities(AlignmentView seqData, SimilarityParamsI options);
 }