X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FPCA.java;h=f0b7f1644dedce27bb847c8efe292bd4df713eb6;hb=9c9bc24a6be8af1a97914b246b8ce2d0eaabf5fd;hp=ff4ed38c0293e8a3bd9ab89243fadfef514a9895;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git

diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java
index ff4ed38..f0b7f16 100755
--- a/src/jalview/analysis/PCA.java
+++ b/src/jalview/analysis/PCA.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -20,7 +20,10 @@ package jalview.analysis;
 import java.io.*;
 
 import jalview.datamodel.*;
+import jalview.datamodel.BinarySequence.InvalidSequenceTypeException;
 import jalview.math.*;
+import jalview.schemes.ResidueProperties;
+import jalview.schemes.ScoreMatrix;
 
 /**
  * Performs Principal Component Analysis on given sequences
@@ -43,20 +46,36 @@ public class PCA implements Runnable
   StringBuffer details = new StringBuffer();
 
   /**
-   * Creates a new PCA object.
+   * Creates a new PCA object. By default, uses blosum62 matrix to generate
+   * sequence similarity matrices
    * 
    * @param s
-   *          Set of sequences to perform PCA on
+   *          Set of amino acid sequences to perform PCA on
    */
   public PCA(String[] s)
   {
+    this(s, false);
+  }
+
+  /**
+   * Creates a new PCA object. By default, uses blosum62 matrix to generate
+   * sequence similarity matrices
+   * 
+   * @param s
+   *          Set of sequences to perform PCA on
+   * @param nucleotides
+   *          if true, uses standard DNA/RNA matrix for sequence similarity
+   *          calculation.
+   */
+  public PCA(String[] s, boolean nucleotides)
+  {
 
     BinarySequence[] bs = new BinarySequence[s.length];
     int ii = 0;
 
     while ((ii < s.length) && (s[ii] != null))
     {
-      bs[ii] = new BinarySequence(s[ii]);
+      bs[ii] = new BinarySequence(s[ii], nucleotides);
       bs[ii].encode();
       ii++;
     }
@@ -64,10 +83,23 @@ public class PCA implements Runnable
     BinarySequence[] bs2 = new BinarySequence[s.length];
     ii = 0;
 
+    String sm = nucleotides ? "DNA" : "BLOSUM62";
+    ScoreMatrix smtrx = ResidueProperties.getScoreMatrix(sm);
+    details.append("PCA calculation using " + sm
+            + " sequence similarity matrix\n========\n\n");
     while ((ii < s.length) && (s[ii] != null))
     {
-      bs2[ii] = new BinarySequence(s[ii]);
-      bs2[ii].blosumEncode();
+      bs2[ii] = new BinarySequence(s[ii], nucleotides);
+      if (smtrx != null)
+      {
+        try
+        {
+          bs2[ii].matrixEncode(smtrx);
+        } catch (InvalidSequenceTypeException x)
+        {
+          details.append("Unexpected mismatch of sequence type and score matrix. Calculation will not be valid!\n\n");
+        }
+      }
       ii++;
     }
 
@@ -204,11 +236,18 @@ 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");
-    // eigenvector = mt.preMultiply(m); // standard seqspace comparison matrix
-    eigenvector = mt.preMultiply(m2); // jalview variation on seqsmace method
+    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)
     {
@@ -252,4 +291,11 @@ public class PCA implements Runnable
      * ps.print(","+component(seq, ev)); } ps.println(); }
      */
   }
+
+  boolean jvCalcMode = true;
+
+  public void setJvCalcMode(boolean calcMode)
+  {
+    this.jvCalcMode = calcMode;
+  }
 }