JAL-2403 ScoreModelI now DistanceModelI, ScoreMatrix delegate of

[jalview.git] / src / jalview / analysis / scoremodels / ScoreModels.java

diff --git a/src/jalview/analysis/scoremodels/ScoreModels.java b/src/jalview/analysis/scoremodels/ScoreModels.java
index 2419997..043e6fb 100644 (file)
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@ -1,6 +1,6 @@
 package jalview.analysis.scoremodels;
 
-import jalview.api.analysis.ScoreModelI;
+import jalview.api.analysis.DistanceModelI;
 import jalview.io.DataSourceType;
 import jalview.io.FileParse;
 import jalview.io.ScoreMatrixFile;
@@ -18,9 +18,11 @@ public class ScoreModels
 
   private final ScoreMatrix PAM250;
 
+  private final ScoreMatrix DNA;
+
   private static ScoreModels instance = new ScoreModels();
 
-  private Map<String, ScoreModelI> models;
+  private Map<String, DistanceModelI> models;
 
   public static ScoreModels getInstance()
   {
@@ -44,13 +46,15 @@ public class ScoreModels
     /*
      * using LinkedHashMap keeps models ordered as added
      */
-    models = new LinkedHashMap<String, ScoreModelI>();
+    models = new LinkedHashMap<String, DistanceModelI>();
     BLOSUM62 = loadScoreMatrix("scoreModel/blosum62.scm");
     PAM250 = loadScoreMatrix("scoreModel/pam250.scm");
-    loadScoreMatrix("scoreModel/dna.scm");
     loadScoreMatrix("scoreModel/seqspace.scm");
-    registerScoreModel(new FeatureScoreModel());
-    registerScoreModel(new PIDScoreModel());
+    // drop seqspace.scm for IdentityScoreModel once JAL-2379 merged in?
+    // registerScoreModel(new IdentityScoreModel());
+    DNA = loadScoreMatrix("scoreModel/dna.scm");
+    registerScoreModel(new FeatureDistanceModel());
+    registerScoreModel(new PIDDistanceModel());
   }
 
   /**
@@ -80,24 +84,34 @@ public class ScoreModels
   }
 
   /**
+   * Registers a pairwise score model
+   * 
+   * @param sm
+   */
+  public void registerScoreModel(PairwiseScoreModelI sm)
+  {
+    registerScoreModel(new PairwiseDistanceModel(sm));
+  }
+
+  /**
    * Answers an iterable set of the registered score models. Currently these are
    * returned in the order in which they were registered.
    * 
    * @return
    */
-  public Iterable<ScoreModelI> getModels()
+  public Iterable<DistanceModelI> getModels()
   {
     return models.values();
   }
 
-  public ScoreModelI forName(String s)
+  public DistanceModelI forName(String s)
   {
     return models.get(s);
   }
 
-  public void registerScoreModel(ScoreModelI sm)
+  public void registerScoreModel(DistanceModelI sm)
   {
-    ScoreModelI sm2 = models.get(sm.getName());
+    DistanceModelI sm2 = models.get(sm.getName());
     if (sm2 != null)
     {
       System.err.println("Warning: replacing score model " + sm2.getName());
@@ -112,10 +126,9 @@ public class ScoreModels
    * @param forPeptide
    * @return
    */
-  public PairwiseSeqScoreModel getDefaultModel(boolean forPeptide)
+  public ScoreMatrix getDefaultModel(boolean forPeptide)
   {
-    return (PairwiseSeqScoreModel) (forPeptide ? forName("BLOSUM62")
-            : forName("DNA"));
+    return forPeptide ? BLOSUM62 : DNA;
   }
 
   public ScoreMatrix getBlosum62()