c = '-';
}
- if (!canonicaliseAa && 'a' <= c && c <= 'z')
- {
- c -= (32); // 32 = 'a' - 'A'
- }
+ c = toUpperCase(c);
}
values[c]++;
}
resultHash.put(type, ht.get("-"));
}
}
- else if (((Integer) resultHash.get(type)).equals(ht
- .get(res)) == false)
+ else if (((Integer) resultHash.get(type)).equals(ht.get(res)) == false)
{
resultHash.put(type, new Integer(-1));
}
}
else
{
+ c = toUpperCase(c);
nres++;
if (nres == 1)
}
/**
+ * Returns the upper-cased character if between 'a' and 'z', else the
+ * unchanged value
+ *
+ * @param c
+ * @return
+ */
+ char toUpperCase(char c)
+ {
+ if ('a' <= c && c <= 'z')
+ {
+ c -= (32); // 32 = 'a' - 'A'
+ }
+ return c;
+ }
+
+ /**
* Calculates the conservation sequence
*
* @param consflag
{
consString.append('-');
}
- consSymbs = new String[end-start+1];
+ consSymbs = new String[end - start + 1];
for (int i = start; i <= end; i++)
{
gapcons = countConsNGaps(i);
totGaps = gapcons[1];
pgaps = ((float) totGaps * 100) / sequences.length;
- consSymbs[i-start]=new String();
-
+ consSymbs[i - start] = new String();
+
if (percentageGaps > pgaps)
{
resultHash = total[i - start];
{
if (result.intValue() == 1)
{
- consSymbs[i-start] = type+" "+consSymbs[i-start];
+ consSymbs[i - start] = type + " " + consSymbs[i - start];
count++;
}
}
{
if (result.intValue() != -1)
{
- {
- if (result.intValue()==0) {
- consSymbs[i-start] = consSymbs[i-start]+ " !"+type;
- } else {
- consSymbs[i-start] = type+" "+consSymbs[i-start];
- }
+ {
+ if (result.intValue() == 0)
+ {
+ consSymbs[i - start] = consSymbs[i - start] + " !" + type;
+ }
+ else
+ {
+ consSymbs[i - start] = type + " " + consSymbs[i - start];
+ }
}
-
+
count++;
}
}
String conssym = (value > 0 && consp > -1 && consp < consSymbs.length) ? consSymbs[consp]
: "";
conservation.annotations[i] = new Annotation(String.valueOf(c),
- conssym, ' ', value, new Color(minR
- + (maxR * vprop), minG + (maxG * vprop), minB
- + (maxB * vprop)));
+ conssym, ' ', value, new Color(minR + (maxR * vprop), minG
+ + (maxG * vprop), minB + (maxB * vprop)));
// Quality calc
if (quality2 != null)