X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fanalysis%2FPCA.java;h=caf7bafc197178741eb39cb1dc6a2b07c04f6c89;hb=34b0957351af77e07f1f52c8df37479d812bb33a;hp=89c635397fdbfc9c369769ae7bbe660251430380;hpb=608bc7b65ff89fc814d05275fcaa87bdfa4cd9be;p=jalview.git
diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java
index 89c6353..caf7baf 100755
--- a/src/jalview/analysis/PCA.java
+++ b/src/jalview/analysis/PCA.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.analysis;
@@ -70,6 +72,11 @@ public class PCA implements Runnable
*/
public PCA(String[] s, boolean nucleotides)
{
+ this(s, nucleotides, null);
+ }
+
+ public PCA(String[] s, boolean nucleotides, String s_m)
+ {
BinarySequence[] bs = new BinarySequence[s.length];
int ii = 0;
@@ -83,9 +90,19 @@ public class PCA implements Runnable
BinarySequence[] bs2 = new BinarySequence[s.length];
ii = 0;
-
- String sm = nucleotides ? "DNA" : "BLOSUM62";
- ScoreMatrix smtrx = ResidueProperties.getScoreMatrix(sm);
+ ScoreMatrix smtrx = null;
+ String sm = s_m;
+ if (sm != null)
+ {
+ smtrx = ResidueProperties.getScoreMatrix(sm);
+ }
+ if (smtrx == null)
+ {
+ // either we were given a non-existent score matrix or a scoremodel that
+ // isn't based on a pairwise symbol score matrix
+ smtrx = ResidueProperties.getScoreMatrix(sm = (nucleotides ? "DNA"
+ : "BLOSUM62"));
+ }
details.append("PCA calculation using " + sm
+ " sequence similarity matrix\n========\n\n");
while ((ii < s.length) && (s[ii] != null))
@@ -250,41 +267,45 @@ public class PCA implements Runnable
}
};
- try {
- details.append("PCA Calculation Mode is "
- + (jvCalcMode ? "Jalview variant" : "Original SeqSpace") + "\n");
- Matrix mt = m.transpose();
-
- details.append(" --- OrigT * Orig ---- \n");
- if (!jvCalcMode)
- {
- eigenvector = mt.preMultiply(m); // standard seqspace comparison matrix
- }
- else
+ try
{
- eigenvector = mt.preMultiply(m2); // jalview variation on seqsmace method
- }
+ details.append("PCA Calculation Mode is "
+ + (jvCalcMode ? "Jalview variant" : "Original SeqSpace")
+ + "\n");
+ Matrix mt = m.transpose();
- eigenvector.print(ps);
+ details.append(" --- OrigT * Orig ---- \n");
+ if (!jvCalcMode)
+ {
+ eigenvector = mt.preMultiply(m); // standard seqspace comparison matrix
+ }
+ else
+ {
+ eigenvector = mt.preMultiply(m2); // jalview variation on seqsmace
+ // method
+ }
- symm = eigenvector.copy();
+ eigenvector.print(ps);
- eigenvector.tred();
+ symm = eigenvector.copy();
- details.append(" ---Tridiag transform matrix ---\n");
- details.append(" --- D vector ---\n");
- eigenvector.printD(ps);
- ps.println();
- details.append("--- E vector ---\n");
- eigenvector.printE(ps);
- ps.println();
+ eigenvector.tred();
+
+ details.append(" ---Tridiag transform matrix ---\n");
+ details.append(" --- D vector ---\n");
+ eigenvector.printD(ps);
+ ps.println();
+ details.append("--- E vector ---\n");
+ eigenvector.printE(ps);
+ ps.println();
- // Now produce the diagonalization matrix
- eigenvector.tqli();
+ // Now produce the diagonalization matrix
+ eigenvector.tqli();
} catch (Exception q)
{
q.printStackTrace();
- details.append("\n*** Unexpected exception when performing PCA ***\n"+q.getLocalizedMessage());
+ details.append("\n*** Unexpected exception when performing PCA ***\n"
+ + q.getLocalizedMessage());
details.append("*** Matrices below may not be fully diagonalised. ***\n");
}