JAL-2089 patch broken merge to master for Release 2.10.0b1

[jalview.git] / src / jalview / analysis / scoremodels / SWScoreModel.java

diff --git a/src/jalview/analysis/scoremodels/SWScoreModel.java b/src/jalview/analysis/scoremodels/SWScoreModel.java
index 6e85b5e..d5d998e 100644 (file)
--- a/src/jalview/analysis/scoremodels/SWScoreModel.java
+++ b/src/jalview/analysis/scoremodels/SWScoreModel.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * 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.
  * 
@@ -32,24 +32,40 @@ public class SWScoreModel implements ScoreModelI
   @Override
   public float[][] findDistances(AlignmentView seqData)
   {
-    SequenceI[] sequenceString = seqData
-            .getVisibleAlignment(Comparison.GapChars.charAt(0)).getSequencesArray();
+    SequenceI[] sequenceString = seqData.getVisibleAlignment(
+            Comparison.GapChars.charAt(0)).getSequencesArray();
     int noseqs = sequenceString.length;
     float[][] distance = new float[noseqs][noseqs];
-    
-     float max = -1;
-      
-      for (int i = 0; i < (noseqs - 1); i++) { for (int j = i; j < noseqs; j++)
-      { AlignSeq as = new AlignSeq(sequenceString[i], sequenceString[j], seqData.isNa() ? "dna" : "pep");
-      as.calcScoreMatrix(); as.traceAlignment(); as.printAlignment(System.out);
-      distance[i][j] = (float) as.maxscore;
-      
-      if (max < distance[i][j]) { max = distance[i][j]; } } }
-     
-      for (int i = 0; i < (noseqs - 1); i++) { for (int j = i; j < noseqs; j++)
-      { distance[i][j] = max - distance[i][j]; distance[j][i] = distance[i][j];
-      } } 
-     
+
+    float max = -1;
+
+    for (int i = 0; i < (noseqs - 1); i++)
+    {
+      for (int j = i; j < noseqs; j++)
+      {
+        AlignSeq as = new AlignSeq(sequenceString[i], sequenceString[j],
+                seqData.isNa() ? "dna" : "pep");
+        as.calcScoreMatrix();
+        as.traceAlignment();
+        as.printAlignment(System.out);
+        distance[i][j] = (float) as.maxscore;
+
+        if (max < distance[i][j])
+        {
+          max = distance[i][j];
+        }
+      }
+    }
+
+    for (int i = 0; i < (noseqs - 1); i++)
+    {
+      for (int j = i; j < noseqs; j++)
+      {
+        distance[i][j] = max - distance[i][j];
+        distance[j][i] = distance[i][j];
+      }
+    }
+
     return distance;
   }
 
@@ -58,17 +74,21 @@ public class SWScoreModel implements ScoreModelI
   {
     return "Smith Waterman Score";
   }
+
   @Override
   public boolean isDNA()
   {
     return true;
   }
+
   @Override
   public boolean isProtein()
   {
     return true;
   }
-  public String toString() {
+
+  public String toString()
+  {
     return "Score between two sequences aligned with Smith Waterman with default Peptide/Nucleotide matrix";
   }
 }