X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2FPCAModel.java;h=5e7fca26507662e2235e774754c6abc8241ff9e9;hb=36067eda8f713ab855b839fd4cc9af5cf36854a4;hp=fa4b7476351e7a9ae1524ee3faf13aa3c8560d8c;hpb=7f5ab7d1f58d870622968e0e6a430f33403b8e4f;p=jalview.git

diff --git a/src/jalview/viewmodel/PCAModel.java b/src/jalview/viewmodel/PCAModel.java
index fa4b747..5e7fca2 100644
--- a/src/jalview/viewmodel/PCAModel.java
+++ b/src/jalview/viewmodel/PCAModel.java
@@ -21,9 +21,9 @@
 package jalview.viewmodel;
 
 import jalview.analysis.PCA;
-import jalview.analysis.scoremodels.ScoreModels;
 import jalview.api.RotatableCanvasI;
 import jalview.api.analysis.ScoreModelI;
+import jalview.api.analysis.SimilarityParamsI;
 import jalview.datamodel.AlignmentView;
 import jalview.datamodel.SequenceI;
 import jalview.datamodel.SequencePoint;
@@ -41,7 +41,7 @@ public class PCAModel
   SequenceI[] seqs;
 
   /*
-   * Score model used to calculate PCA
+   * Name of score model used to calculate PCA
    */
   ScoreModelI scoreModel;
 
@@ -49,26 +49,31 @@ public class PCAModel
 
   private Vector<SequencePoint> points;
 
-  private boolean jvCalcMode = true;
+  private SimilarityParamsI similarityParams;
 
-  public PCAModel(AlignmentView seqstrings2, SequenceI[] seqs2,
-          boolean nucleotide2)
-  {
-    seqstrings = seqstrings2;
-    seqs = seqs2;
-    nucleotide = nucleotide2;
-    scoreModel = ScoreModels.getInstance().getDefaultModel(!nucleotide);
-  }
-
-  public boolean isJvCalcMode()
+  /**
+   * Constructor given sequence data, score model and score calculation
+   * parameter options.
+   * 
+   * @param seqData
+   * @param sqs
+   * @param nuc
+   * @param modelName
+   * @param params
+   */
+  public PCAModel(AlignmentView seqData, SequenceI[] sqs, boolean nuc,
+          ScoreModelI modelName, SimilarityParamsI params)
   {
-    return jvCalcMode;
+    seqstrings = seqData;
+    seqs = sqs;
+    nucleotide = nuc;
+    scoreModel = modelName;
+    similarityParams = params;
   }
 
   public void run()
   {
-    pca = new PCA(seqstrings, scoreModel);
-    pca.setJvCalcMode(jvCalcMode);
+    pca = new PCA(seqstrings, scoreModel, similarityParams);
     pca.run();
 
     // Now find the component coordinates
@@ -215,11 +220,6 @@ public class PCAModel
     return pts;
   }
 
-  public void setJvCalcMode(boolean state)
-  {
-    jvCalcMode = state;
-  }
-
   public String getScoreModelName()
   {
     return scoreModel == null ? "" : scoreModel.getName();