formatting

[jalview.git] / src / jalview / analysis / PCA.java

diff --git a/src/jalview/analysis/PCA.java b/src/jalview/analysis/PCA.java
index b001549..43dab7c 100755 (executable)
--- a/src/jalview/analysis/PCA.java
+++ b/src/jalview/analysis/PCA.java
@@ -46,8 +46,9 @@ public class PCA implements Runnable
   StringBuffer details = new StringBuffer();
 
   /**
-   * Creates a new PCA object.
-   * By default, uses blosum62 matrix to generate sequence similarity matrices
+   * Creates a new PCA object. By default, uses blosum62 matrix to generate
+   * sequence similarity matrices
+   * 
    * @param s
    *          Set of amino acid sequences to perform PCA on
    */
@@ -55,13 +56,16 @@ public class PCA implements Runnable
   {
     this(s, false);
   }
-  
+
   /**
-   * Creates a new PCA object.
-   * By default, uses blosum62 matrix to generate sequence similarity matrices
+   * 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.
+   * @param nucleotides
+   *          if true, uses standard DNA/RNA matrix for sequence similarity
+   *          calculation.
    */
   public PCA(String[] s, boolean nucleotides)
   {
@@ -71,7 +75,7 @@ public class PCA implements Runnable
 
     while ((ii < s.length) && (s[ii] != null))
     {
-      bs[ii] = new BinarySequence(s[ii],nucleotides);
+      bs[ii] = new BinarySequence(s[ii], nucleotides);
       bs[ii].encode();
       ii++;
     }
@@ -79,10 +83,10 @@ 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");
-    
+    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], nucleotides);
@@ -232,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)
     {
@@ -280,4 +292,11 @@ public class PCA implements Runnable
      * ps.print(","+component(seq, ev)); } ps.println(); }
      */
   }
+
+  boolean jvCalcMode = true;
+
+  public void setJvCalcMode(boolean calcMode)
+  {
+    this.jvCalcMode = calcMode;
+  }
 }