From: Ben Soares Date: Thu, 22 Jun 2023 13:35:12 +0000 (+0100) Subject: JAL-4019 corrected to '>' to '>=' for percentage comparisons X-Git-Tag: Release_2_11_3_0~13^2~6 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=3acfdb3ddd5e3b785fd0880bcebc9e267a717bbe JAL-4019 corrected to '>' to '>=' for percentage comparisons --- diff --git a/src/jalview/util/Comparison.java b/src/jalview/util/Comparison.java index 9fea705..e9ff931 100644 --- a/src/jalview/util/Comparison.java +++ b/src/jalview/util/Comparison.java @@ -337,9 +337,9 @@ public class Comparison // a long sequence. // check for at least 55% nucleotide, and nucleotide and ambiguity codes // (including N) must make up 95% - return ntCount * 100 > NUCLEOTIDE_COUNT_PERCENT * allCount + return ntCount * 100 >= NUCLEOTIDE_COUNT_PERCENT * allCount && 100 * (ntCount + nCount - + ntaCount) > NUCLEOTIDE_COUNT_LONG_SEQUENCE_AMBIGUITY_PERCENT + + ntaCount) >= NUCLEOTIDE_COUNT_LONG_SEQUENCE_AMBIGUITY_PERCENT * allCount; } else if (allCount > NUCLEOTIDE_COUNT_VERY_SHORT_SEQUENCE) @@ -347,7 +347,7 @@ public class Comparison // a short sequence. // check if a short sequence is at least 55% nucleotide and the rest of // the symbols are all X or all N - if (ntCount * 100 > NUCLEOTIDE_COUNT_PERCENT * allCount + if (ntCount * 100 >= NUCLEOTIDE_COUNT_PERCENT * allCount && (nCount == aaCount || xCount == aaCount)) { return true;