X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FComparison.java;h=22e1ab7b39d3070c163f3bcd4dbcfb9b6d1e40f5;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=1326647f26e737edb5d63f7f635486e38c51b998;hpb=8677e6e34e291edc58c1da2fc9c958473754143f;p=jalview.git diff --git a/src/jalview/util/Comparison.java b/src/jalview/util/Comparison.java index 1326647..22e1ab7 100644 --- a/src/jalview/util/Comparison.java +++ b/src/jalview/util/Comparison.java @@ -34,11 +34,11 @@ public class Comparison private static final int TO_UPPER_CASE = 'a' - 'A'; - private static final char GAP_SPACE = ' '; + public static final char GAP_SPACE = ' '; - private static final char GAP_DOT = '.'; + public static final char GAP_DOT = '.'; - private static final char GAP_DASH = '-'; + public static final char GAP_DASH = '-'; public static final String GapChars = new String(new char[] { GAP_SPACE, GAP_DOT, GAP_DASH }); @@ -135,7 +135,9 @@ public class Comparison * @param s2 * SequenceI * @return float + * @deprecated use PIDModel.computePID() */ + @Deprecated public final static float PID(String seq1, String seq2) { return PID(seq1, seq2, 0, seq1.length()); @@ -144,6 +146,10 @@ public class Comparison static final int caseShift = 'a' - 'A'; // Another pid with region specification + /** + * @deprecated use PIDModel.computePID() + */ + @Deprecated public final static float PID(String seq1, String seq2, int start, int end) { return PID(seq1, seq2, start, end, true, false); @@ -165,7 +171,9 @@ public class Comparison * @param ungappedOnly * - if true - only count PID over ungapped columns * @return + * @deprecated use PIDModel.computePID() */ + @Deprecated public final static float PID(String seq1, String seq2, int start, int end, boolean wcGaps, boolean ungappedOnly) {