X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FPCA.java;h=109a5918bc30fe787376e12772f357df1ff2e20d;hb=72c628be04c81e9a9748edc65e710045d6410980;hp=6af3348437671e76a317cdb1becb6b8026095380;hpb=3f2c944fa85f6fca552e84e793fe0795e064e9d1;p=jalview.git

diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java
index 6af3348..109a591 100755
--- a/src/jalview/analysis/PCA.java
+++ b/src/jalview/analysis/PCA.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * 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 
@@ -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,19 @@ 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)
     {
@@ -245,15 +285,18 @@ public class PCA implements Runnable
     details.append(" --- Eigenvalues ---\n");
     eigenvector.printD(ps);
     ps.println();
-    /*for (int seq=0;seq<symm.rows;seq++)
-    {
-      ps.print("\"Seq"+seq+"\"");
-      for (int ev=0;ev<symm.rows; ev++)
-      {
-        
-        ps.print(","+component(seq, ev));
-      }
-      ps.println(); 
-    }*/
+    /*
+     * for (int seq=0;seq<symm.rows;seq++) { ps.print("\"Seq"+seq+"\""); for
+     * (int ev=0;ev<symm.rows; ev++) {
+     * 
+     * ps.print(","+component(seq, ev)); } ps.println(); }
+     */
+  }
+
+  boolean jvCalcMode = true;
+
+  public void setJvCalcMode(boolean calcMode)
+  {
+    this.jvCalcMode = calcMode;
   }
 }