X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fviewmodel%2FPCAModel.java;h=f21600997319e8b2f514bbdb86a6a288c3332298;hb=567c2595554096f10feab130153f97286f3f7d80;hp=324c69a538bb0be5f9e0d886aaa43eb729ea4124;hpb=74c5bd7b1f98214a6d57d7c64d0548013530d397;p=jalview.git diff --git a/src/jalview/viewmodel/PCAModel.java b/src/jalview/viewmodel/PCAModel.java index 324c69a..f216009 100644 --- a/src/jalview/viewmodel/PCAModel.java +++ b/src/jalview/viewmodel/PCAModel.java @@ -21,7 +21,6 @@ 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; @@ -55,22 +54,22 @@ public class PCAModel private SimilarityParamsI similarityParams; /** - * Constructor given sequence data and score calculation parameter options. - * The initial state is to compute PCA using a default score model (BLOSUM62 - * for peptide, DNA for nucleotide). + * Constructor given sequence data, score model and score calculation + * parameter options. * * @param seqData * @param sqs * @param nuc + * @param sm * @param params */ - public PCAModel(AlignmentView seqData, SequenceI[] sqs, boolean nuc, + public PCAModel(AlignmentView seqData, SequenceI[] sqs, boolean nuc, ScoreModelI sm, SimilarityParamsI params) { seqstrings = seqData; seqs = sqs; nucleotide = nuc; - scoreModel = ScoreModels.getInstance().getDefaultModel(!nucleotide); + scoreModel = sm; similarityParams = params; }