X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FPCA.java;fp=src%2Fjalview%2Fanalysis%2FPCA.java;h=d8863f79426cd38706267ab81ce3bcbb59398c68;hb=68fda9ddcedbd909aef2f1bfc7f43fe7cabd5d5a;hp=11c73c122be060ccfe36b2ec86b380075fab4d8e;hpb=3e49bcba7b477c8f016f5b073a0cd2808739a944;p=jalview.git diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java index 11c73c1..d8863f7 100755 --- a/src/jalview/analysis/PCA.java +++ b/src/jalview/analysis/PCA.java @@ -43,7 +43,7 @@ public class PCA implements Runnable StringBuilder details = new StringBuilder(1024); - private AlignmentView seqs; + final private AlignmentView seqs; private ScoreModelI scoreModel; @@ -172,7 +172,7 @@ public class PCA implements Runnable // long now = System.currentTimeMillis(); try { - eigenvector = computeSimilarity(seqs); + eigenvector = computeSimilarity(); details.append(" --- OrigT * Orig ---- \n"); eigenvector.print(ps, "%8.2f"); @@ -223,20 +223,20 @@ public class PCA implements Runnable * @param av * @return */ - MatrixI computeSimilarity(AlignmentView av) + MatrixI computeSimilarity() { MatrixI result = null; if (scoreModel instanceof SimilarityScoreModelI) { - result = ((SimilarityScoreModelI) scoreModel).findSimilarities(av, + result = ((SimilarityScoreModelI) scoreModel).findSimilarities(seqs, similarityParams); if (scoreModel instanceof PIDModel) { /* - * scale % identities to width of alignment for backwards + * scale score to width of alignment for backwards * compatibility with Jalview 2.10.1 SeqSpace PCA calculation */ - result.multiply(av.getWidth() / 100d); + result.multiply(seqs.getWidth() / 100d); } } else if (scoreModel instanceof DistanceScoreModelI) @@ -245,7 +245,7 @@ public class PCA implements Runnable * find distances and convert to similarity scores * reverseRange(false) preserves but reverses the min-max range */ - result = ((DistanceScoreModelI) scoreModel).findDistances(av, + result = ((DistanceScoreModelI) scoreModel).findDistances(seqs, similarityParams); result.reverseRange(false); }