X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FPCA.java;h=733e7f99e333f60532e73d9ccf32f33971159c7c;hb=066a11f5ce0580b9d7bf0f855432c341aa279bd4;hp=f0b7f1644dedce27bb847c8efe292bd4df713eb6;hpb=dc70d08df6e45850e465c4d39e93c820b4ff8341;p=jalview.git

diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java
index f0b7f16..733e7f9 100755
--- a/src/jalview/analysis/PCA.java
+++ b/src/jalview/analysis/PCA.java
@@ -1,19 +1,20 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 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.
- * 
+ *  
  * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.analysis;
 
@@ -69,6 +70,10 @@ 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;
@@ -82,9 +87,17 @@ 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))
@@ -236,19 +249,6 @@ public class PCA implements Runnable
    */
   public void run()
   {
-    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
-    {
-      eigenvector = mt.preMultiply(m2); // jalview variation on seqsmace method
-    }
-
     PrintStream ps = new PrintStream(System.out)
     {
       public void print(String x)
@@ -262,6 +262,21 @@ 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
+    {
+      eigenvector = mt.preMultiply(m2); // jalview variation on seqsmace method
+    }
+
     eigenvector.print(ps);
 
     symm = eigenvector.copy();
@@ -278,6 +293,12 @@ public class PCA implements Runnable
 
     // 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("*** Matrices below may not be fully diagonalised. ***\n");
+    }
 
     details.append(" --- New diagonalization matrix ---\n");
     eigenvector.print(ps);