X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAAFrequency.java;h=ca4e71cef32a8ec42b69a10afbbff88460622fa4;hb=7c7a5a297e063d3892dd7e629bc317cdde837b81;hp=7e77b0fb8985a61fa965fd097df14beab3e5a0fd;hpb=3f734555193e56f46b07d5bc12df77d26e180ec0;p=jalview.git
diff --git a/src/jalview/analysis/AAFrequency.java b/src/jalview/analysis/AAFrequency.java
index 7e77b0f..ca4e71c 100755
--- a/src/jalview/analysis/AAFrequency.java
+++ b/src/jalview/analysis/AAFrequency.java
@@ -1,24 +1,26 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
+ *
* This file is part of Jalview.
- *
+ *
* Jalview is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * Jalview is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.analysis;
import java.util.*;
+import jalview.util.Format;
import jalview.datamodel.*;
/**
@@ -26,7 +28,7 @@ import jalview.datamodel.*;
* returns a new Hashtable[] of size maxSeqLength, if Hashtable not supplied.
* This class is used extensively in calculating alignment colourschemes that
* depend on the amount of conservation in each alignment column.
- *
+ *
* @author $author$
* @version $Revision$
*/
@@ -44,37 +46,38 @@ public class AAFrequency
public static final String PROFILE = "P";
- public static final Hashtable[] calculate(List list, int start,
- int end)
+ public static final Hashtable[] calculate(List list,
+ int start, int end)
{
return calculate(list, start, end, false);
}
- public static final Hashtable[] calculate(List sequences, int start,
- int end, boolean profile)
+ public static final Hashtable[] calculate(List sequences,
+ int start, int end, boolean profile)
{
SequenceI[] seqs = new SequenceI[sequences.size()];
int width = 0;
- synchronized (sequences) {
- for (int i = 0; i < sequences.size(); i++)
+ synchronized (sequences)
{
- seqs[i] = sequences.get(i);
- if (seqs[i].getLength() > width)
+ for (int i = 0; i < sequences.size(); i++)
{
- width = seqs[i].getLength();
+ seqs[i] = sequences.get(i);
+ if (seqs[i].getLength() > width)
+ {
+ width = seqs[i].getLength();
+ }
}
- }
- Hashtable[] reply = new Hashtable[width];
+ Hashtable[] reply = new Hashtable[width];
- if (end >= width)
- {
- end = width;
- }
+ if (end >= width)
+ {
+ end = width;
+ }
- calculate(seqs, start, end, reply, profile);
- return reply;
- }
+ calculate(seqs, start, end, reply, profile);
+ return reply;
+ }
}
public static final void calculate(SequenceI[] sequences, int start,
@@ -89,7 +92,7 @@ public class AAFrequency
Hashtable residueHash;
int maxCount, nongap, i, j, v, jSize = sequences.length;
String maxResidue;
- char c;
+ char c='-';
float percentage;
int[] values = new int[255];
@@ -103,12 +106,13 @@ public class AAFrequency
maxResidue = "";
nongap = 0;
values = new int[255];
-
+
for (j = 0; j < jSize; j++)
{
- if (sequences[j]==null)
+ if (sequences[j] == null)
{
- System.err.println("WARNING: Consensus skipping null sequence - possible race condition.");
+ System.err
+ .println("WARNING: Consensus skipping null sequence - possible race condition.");
continue;
}
seq = sequences[j].getSequence();
@@ -140,8 +144,11 @@ public class AAFrequency
values['-']++;
}
}
-
- for (v = 'A'; v < 'Z'; v++)
+ if (jSize==1)
+ {
+ maxResidue = String.valueOf(c);
+ maxCount=1;
+ } else {for (v = 'A'; v < 'Z'; v++)
{
if (values[v] < 2 || values[v] < maxCount)
{
@@ -158,7 +165,7 @@ public class AAFrequency
}
maxCount = values[v];
}
-
+ }
if (maxResidue.length() == 0)
{
maxResidue = "-";
@@ -175,8 +182,10 @@ public class AAFrequency
percentage = ((float) maxCount * 100) / jSize;
residueHash.put(PID_GAPS, new Float(percentage));
- percentage = ((float) maxCount * 100) / nongap;
- residueHash.put(PID_NOGAPS, new Float(percentage));
+ if (nongap>0) {
+ percentage = ((float) maxCount * 100) / nongap;
+ residueHash.put(PID_NOGAPS, new Float(percentage));
+ }
result[i] = residueHash;
}
}
@@ -184,7 +193,7 @@ public class AAFrequency
/**
* Compute all or part of the annotation row from the given consensus
* hashtable
- *
+ *
* @param consensus
* - pre-allocated annotation row
* @param hconsensus
@@ -192,14 +201,15 @@ public class AAFrequency
* @param width
* @param ignoreGapsInConsensusCalculation
* @param includeAllConsSymbols
+ * @param nseq
*/
public static void completeConsensus(AlignmentAnnotation consensus,
Hashtable[] hconsensus, int iStart, int width,
boolean ignoreGapsInConsensusCalculation,
- boolean includeAllConsSymbols)
+ boolean includeAllConsSymbols, long nseq)
{
completeConsensus(consensus, hconsensus, iStart, width,
- ignoreGapsInConsensusCalculation, includeAllConsSymbols, null); // new
+ ignoreGapsInConsensusCalculation, includeAllConsSymbols, null, nseq); // new
// char[]
// { 'A', 'C', 'G', 'T', 'U' });
}
@@ -207,7 +217,7 @@ public class AAFrequency
public static void completeConsensus(AlignmentAnnotation consensus,
Hashtable[] hconsensus, int iStart, int width,
boolean ignoreGapsInConsensusCalculation,
- boolean includeAllConsSymbols, char[] alphabet)
+ boolean includeAllConsSymbols, char[] alphabet, long nseq)
{
float tval, value;
if (consensus == null || consensus.annotations == null
@@ -217,17 +227,33 @@ public class AAFrequency
// initialised properly
return;
}
+ String fmtstr="%3.1f";
+ int precision=0;
+ while (nseq>=10) {
+ precision++;
+ nseq/=10;
+ }
+ final Format fmt;
+ if (precision>1)
+ {
+ //if (precision>2)
+ {
+ fmtstr = "%"+(2+precision)+"."+(precision)+"f";
+ }
+ fmt = new Format(fmtstr);
+ } else {
+ fmt = null;
+ }
for (int i = iStart; i < width; i++)
{
Hashtable hci;
- if (i >= hconsensus.length || ((hci=hconsensus[i])==null))
+ if (i >= hconsensus.length || ((hci = hconsensus[i]) == null))
{
// happens if sequences calculated over were shorter than alignment
// width
consensus.annotations[i] = null;
continue;
}
-
value = 0;
Float fv;
if (ignoreGapsInConsensusCalculation)
@@ -238,7 +264,7 @@ public class AAFrequency
{
fv = (Float) hci.get(AAFrequency.PID_GAPS);
}
- if (fv==null)
+ if (fv == null)
{
consensus.annotations[i] = null;
// data has changed below us .. give up and
@@ -260,12 +286,10 @@ public class AAFrequency
{
for (int c = 0; c < alphabet.length; c++)
{
- tval = profile[0][alphabet[c]]
- * 100f
- / profile[1][ignoreGapsInConsensusCalculation ? 1
- : 0];
+ tval = profile[0][alphabet[c]] * 100f
+ / profile[1][ignoreGapsInConsensusCalculation ? 1 : 0];
mouseOver += ((c == 0) ? "" : "; ") + alphabet[c] + " "
- + ((int) tval) + "%";
+ + ((fmt!=null) ? fmt.form(tval) : ((int) tval)) + "%";
}
}
else
@@ -286,10 +310,9 @@ public class AAFrequency
{
tval = profile[0][((char[]) ca[c])[0]]
* 100f
- / profile[1][ignoreGapsInConsensusCalculation ? 1
- : 0];
+ / profile[1][ignoreGapsInConsensusCalculation ? 1 : 0];
mouseOver += ((p == 0) ? "" : "; ") + ((char[]) ca[c])[0]
- + " " + ((int) tval) + "%";
+ + " " + ((fmt!=null) ? fmt.form(tval) : ((int) tval)) + "%";
p++;
}
@@ -299,7 +322,7 @@ public class AAFrequency
}
else
{
- mouseOver += ((int) value + "%");
+ mouseOver += ((fmt!=null) ? fmt.form(value) : ((int) value)) + "%";
}
consensus.annotations[i] = new Annotation(maxRes, mouseOver, ' ',
value);
@@ -308,7 +331,7 @@ public class AAFrequency
/**
* get the sorted profile for the given position of the consensus
- *
+ *
* @param hconsensus
* @return
*/
@@ -330,7 +353,7 @@ public class AAFrequency
;
jalview.util.QuickSort.sort(vl, ca);
rtnval[0] = 2;
- rtnval[1]=0;
+ rtnval[1] = 0;
for (int c = ca.length - 1; profile[0][((char[]) ca[c])[0]] > 0; c--)
{
if (((char[]) ca[c])[0] != '-')
@@ -338,7 +361,7 @@ public class AAFrequency
rtnval[rtnval[0]++] = ((char[]) ca[c])[0];
rtnval[rtnval[0]] = (int) (profile[0][((char[]) ca[c])[0]] * 100f / profile[1][ignoreGapsInConsensusCalculation ? 1
: 0]);
- rtnval[1]+=rtnval[rtnval[0]++];
+ rtnval[1] += rtnval[rtnval[0]++];
}
}
return rtnval;