X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAlignSeq.java;fp=src%2Fjalview%2Fanalysis%2FAlignSeq.java;h=65fd1100b8e8a7f2cdc33f1d1a90f80aaa3076bf;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=2fb6ce13a229e27ffc74236e97f9b64c719d87b2;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/jalview/analysis/AlignSeq.java b/src/jalview/analysis/AlignSeq.java index 2fb6ce1..65fd110 100755 --- a/src/jalview/analysis/AlignSeq.java +++ b/src/jalview/analysis/AlignSeq.java @@ -150,7 +150,8 @@ public class AlignSeq public AlignSeq(SequenceI s1, String string1, SequenceI s2, String string2, String type) { - seqInit(s1, string1.toUpperCase(Locale.ROOT), s2, string2.toUpperCase(Locale.ROOT), type); + seqInit(s1, string1.toUpperCase(Locale.ROOT), s2, + string2.toUpperCase(Locale.ROOT), type); } /** @@ -645,12 +646,14 @@ public class AlignSeq for (int j = 1; j < m; j++) { // What should these values be? 0 maybe - E[0][j] = max(score[0][j - 1] - GAP_OPEN_COST, E[0][j - 1] - GAP_EXTEND_COST); + E[0][j] = max(score[0][j - 1] - GAP_OPEN_COST, + E[0][j - 1] - GAP_EXTEND_COST); F[0][j] = -GAP_EXTEND_COST; float pairwiseScore = scoreMatrix.getPairwiseScore(s1str.charAt(0), s2str.charAt(j)); - score[0][j] = max(pairwiseScore * 10, -GAP_OPEN_COST, -GAP_EXTEND_COST); + score[0][j] = max(pairwiseScore * 10, -GAP_OPEN_COST, + -GAP_EXTEND_COST); traceback[0][j] = 1; } @@ -659,7 +662,8 @@ public class AlignSeq for (int i = 1; i < n; i++) { E[i][0] = -GAP_OPEN_COST; - F[i][0] = max(score[i - 1][0] - GAP_OPEN_COST, F[i - 1][0] - GAP_EXTEND_COST); + F[i][0] = max(score[i - 1][0] - GAP_OPEN_COST, + F[i - 1][0] - GAP_EXTEND_COST); float pairwiseScore = scoreMatrix.getPairwiseScore(s1str.charAt(i), s2str.charAt(0)); @@ -672,8 +676,10 @@ public class AlignSeq { for (int j = 1; j < m; j++) { - E[i][j] = max(score[i][j - 1] - GAP_OPEN_COST, E[i][j - 1] - GAP_EXTEND_COST); - F[i][j] = max(score[i - 1][j] - GAP_OPEN_COST, F[i - 1][j] - GAP_EXTEND_COST); + E[i][j] = max(score[i][j - 1] - GAP_OPEN_COST, + E[i][j - 1] - GAP_EXTEND_COST); + F[i][j] = max(score[i - 1][j] - GAP_OPEN_COST, + F[i - 1][j] - GAP_EXTEND_COST); float pairwiseScore = scoreMatrix.getPairwiseScore(s1str.charAt(i), s2str.charAt(j));