JAL-1483 refactor NJTree constructor to allow preconfigured scoremodel to be passed...

[jalview.git] / src / jalview / analysis / NJTree.java

diff --git a/src/jalview/analysis/NJTree.java b/src/jalview/analysis/NJTree.java
index b956b7a..f08a436 100644 (file)
--- a/src/jalview/analysis/NJTree.java
+++ b/src/jalview/analysis/NJTree.java
@@ -20,13 +20,21 @@
  */
 package jalview.analysis;
 
-import java.util.*;
-
 import jalview.api.analysis.ScoreModelI;
-import jalview.datamodel.*;
-import jalview.io.*;
-import jalview.schemes.*;
-import jalview.util.*;
+import jalview.datamodel.AlignmentView;
+import jalview.datamodel.BinaryNode;
+import jalview.datamodel.CigarArray;
+import jalview.datamodel.NodeTransformI;
+import jalview.datamodel.SeqCigar;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.datamodel.SequenceNode;
+import jalview.io.NewickFile;
+import jalview.schemes.ResidueProperties;
+
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Vector;
 
 /**
  * DOCUMENT ME!
@@ -210,7 +218,7 @@ public class NJTree
    *          DOCUMENT ME!
    */
   public NJTree(SequenceI[] sequence, AlignmentView seqData, String type,
-          String pwtype, int start, int end)
+          String pwtype, ScoreModelI sm, int start, int end)
   {
     this.sequence = sequence;
     this.node = new Vector();
@@ -237,7 +245,7 @@ public class NJTree
       type = "AV";
     }
 
-    if (!(pwtype.equals("PID")))
+    if (sm == null && !(pwtype.equals("PID")))
     {
       if (ResidueProperties.getScoreMatrix(pwtype) == null)
       {
@@ -257,7 +265,7 @@ public class NJTree
 
     noseqs = i++;
 
-    distance = findDistances();
+    distance = findDistances(sm);
     // System.err.println("Made distances");// dbg
     makeLeaves();
     // System.err.println("Made leaves");// dbg
@@ -315,7 +323,7 @@ public class NJTree
 
           for (int j = 0; j < seqs.length; j++)
           {
-            seqs[j] = (SequenceI) list.get(j);
+            seqs[j] = list.get(j);
           }
 
           seqmatcher = new SequenceIdMatcher(seqs);
@@ -722,21 +730,22 @@ public class NJTree
    * 
    * @return similarity matrix used to compute tree
    */
-  public float[][] findDistances()
+  public float[][] findDistances(ScoreModelI _pwmatrix)
   {
-    
-    float[][] distance = new float[noseqs][noseqs];
 
-      // Pairwise substitution score (with no gap penalties)
-      ScoreModelI _pwmatrix = ResidueProperties.getScoreModel(pwtype);
+    float[][] distance = new float[noseqs][noseqs];
+    if (_pwmatrix == null)
+    {
+      // Resolve substitution model
+      _pwmatrix = ResidueProperties.getScoreModel(pwtype);
       if (_pwmatrix == null)
       {
         _pwmatrix = ResidueProperties.getScoreMatrix("BLOSUM62");
       }
-      distance = _pwmatrix.findDistances(seqData);
+    }
+    distance = _pwmatrix.findDistances(seqData);
     return distance;
 
-
   }
 
   /**