* along with this program; if not, write to the Free Software\r
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\r
*/\r
-\r
package jalview.analysis;\r
\r
+import jalview.datamodel.*;\r
\r
-import java.util.*;\r
import jalview.gui.*;\r
-import jalview.datamodel.*;\r
+\r
+import java.util.*;\r
\r
\r
public class Conservation {\r
- Vector sequences;\r
- int start;\r
- int end;\r
- Vector seqNums; // vector of int vectors where first is sequence checksum\r
- int maxLength=0; // used by quality calcs\r
- boolean seqNumsChanged = false; // updated after any change via calcSeqNum;\r
- private void calcSeqNums() {\r
- for (int i=0; i<sequences.size(); i++) {\r
- calcSeqNum(i);\r
+ Vector sequences;\r
+ int start;\r
+ int end;\r
+ Vector seqNums; // vector of int vectors where first is sequence checksum\r
+ int maxLength = 0; // used by quality calcs\r
+ boolean seqNumsChanged = false; // updated after any change via calcSeqNum;\r
+ Vector total = new Vector();\r
+ public Vector quality;\r
+ public Double[] qualityRange = new Double[2];\r
+ String consString = "";\r
+ Sequence consSequence;\r
+ Hashtable propHash;\r
+ int threshold;\r
+ String name = "";\r
+ int[][] cons2;\r
+\r
+ public Conservation(String name, Hashtable propHash, int threshold,\r
+ Vector sequences, int start, int end) {\r
+ this.name = name;\r
+ this.propHash = propHash;\r
+ this.threshold = threshold;\r
+ this.sequences = sequences;\r
+ this.start = start;\r
+ this.end = end;\r
+ seqNums = new Vector(sequences.size());\r
+ calcSeqNums();\r
}\r
- }\r
- private void calcSeqNum(int i) {\r
- String sq=null; // for dumb jbuilder not-inited exception warning\r
- int[] sqnum = null;\r
- if (i>-1 && i<sequences.size()) {\r
- sq = ((SequenceI)sequences.elementAt(i)).getSequence();\r
- if (seqNums.size()<=i) {\r
- seqNums.addElement(new int[sq.length()+1]);\r
- }\r
- if (sq.hashCode()!=((int[])seqNums.elementAt(i))[0])\r
- {\r
- int j, len;\r
- seqNumsChanged = true;\r
- sq = ((SequenceI) sequences.elementAt(i)).getSequence();\r
- len = sq.length();\r
- if (maxLength < len)\r
- maxLength = len;\r
- sqnum = new int[len + 1]; // better to always make a new array - sequence can change its length\r
- sqnum[0] = sq.hashCode();\r
- for (j = 1; j <= len; j++)\r
- {\r
- sqnum[j] = ( (Integer) jalview.schemes.ResidueProperties.aaHash.get(new\r
- String(sq.substring(j - 1, j)))).intValue(); // yuk\r
- }\r
- seqNums.setElementAt(sqnum, i);\r
- }\r
- } else {\r
- // JBPNote INFO level debug\r
- System.err.println("ERROR: calcSeqNum called with out of range sequence index for Alignment\n");\r
- }\r
- }\r
- Vector total = new Vector();\r
- public Vector quality;\r
- public Double[] qualityRange = new Double[2];\r
- String consString = "";\r
-\r
- Sequence consSequence;\r
- Hashtable propHash;\r
- int threshold;\r
-\r
- String name = "";\r
-\r
- public Conservation(String name,Hashtable propHash, int threshold, Vector sequences, int start, int end) {\r
- this.name = name;\r
- this.propHash = propHash;\r
- this.threshold = threshold;\r
- this.sequences = sequences;\r
- this.start = start;\r
- this.end = end;\r
- seqNums = new Vector(sequences.size());\r
- calcSeqNums();\r
- }\r
-\r
-\r
- public void calculate() {\r
-\r
- for (int i = start;i <= end; i++) {\r
- Hashtable resultHash = null;\r
- Hashtable residueHash = null;\r
-\r
- resultHash = new Hashtable();\r
- residueHash = new Hashtable();\r
-\r
- for (int j=0; j < sequences.size(); j++) {\r
- // JBPNote - have to make sure elements of the sequences vector\r
- // are tested like this everywhere...\r
- if (sequences.elementAt(j) instanceof Sequence) {\r
- Sequence s = (Sequence)sequences.elementAt(j);\r
-\r
- if (s.getLength() > i) {\r
- String res = s.getSequence().substring(i,i+1);\r
-\r
- if (residueHash.containsKey(res)) {\r
- int count = ((Integer)residueHash.get(res)).intValue() ;\r
- count++;\r
- residueHash.put(res,new Integer(count));\r
- } else {\r
- residueHash.put(res,new Integer(1));\r
+\r
+ private void calcSeqNums() {\r
+ for (int i = 0; i < sequences.size(); i++) {\r
+ calcSeqNum(i);\r
+ }\r
+ }\r
+\r
+ private void calcSeqNum(int i) {\r
+ String sq = null; // for dumb jbuilder not-inited exception warning\r
+ int[] sqnum = null;\r
+\r
+ if ((i > -1) && (i < sequences.size())) {\r
+ sq = ((SequenceI) sequences.elementAt(i)).getSequence();\r
+\r
+ if (seqNums.size() <= i) {\r
+ seqNums.addElement(new int[sq.length() + 1]);\r
}\r
- } else {\r
- if (residueHash.containsKey("-")) {\r
- int count = ((Integer)residueHash.get("-")).intValue() ;\r
- count++;\r
- residueHash.put("-",new Integer(count));\r
- } else {\r
- residueHash.put("-",new Integer(1));\r
+\r
+ if (sq.hashCode() != ((int[]) seqNums.elementAt(i))[0]) {\r
+ int j;\r
+ int len;\r
+ seqNumsChanged = true;\r
+ sq = ((SequenceI) sequences.elementAt(i)).getSequence();\r
+ len = sq.length();\r
+\r
+ if (maxLength < len) {\r
+ maxLength = len;\r
+ }\r
+\r
+ sqnum = new int[len + 1]; // better to always make a new array - sequence can change its length\r
+ sqnum[0] = sq.hashCode();\r
+\r
+ for (j = 1; j <= len; j++) {\r
+ sqnum[j] = ((Integer) jalview.schemes.ResidueProperties.aaHash.get(new String(\r
+ sq.substring(j - 1, j)))).intValue(); // yuk\r
+ }\r
+\r
+ seqNums.setElementAt(sqnum, i);\r
}\r
- }\r
+ } else {\r
+ // JBPNote INFO level debug\r
+ System.err.println(\r
+ "ERROR: calcSeqNum called with out of range sequence index for Alignment\n");\r
}\r
- }\r
+ }\r
\r
- //What is the count threshold to count the residues in residueHash()\r
- int thresh = threshold*(sequences.size())/100;\r
+ public void calculate() {\r
+ for (int i = start; i <= end; i++) {\r
+ Hashtable resultHash = null;\r
+ Hashtable residueHash = null;\r
+\r
+ resultHash = new Hashtable();\r
+ residueHash = new Hashtable();\r
+\r
+ for (int j = 0; j < sequences.size(); j++) {\r
+ // JBPNote - have to make sure elements of the sequences vector\r
+ // are tested like this everywhere...\r
+ if (sequences.elementAt(j) instanceof Sequence) {\r
+ Sequence s = (Sequence) sequences.elementAt(j);\r
+\r
+ if (s.getLength() > i) {\r
+ String res = s.getSequence().substring(i, i + 1);\r
+\r
+ if (residueHash.containsKey(res)) {\r
+ int count = ((Integer) residueHash.get(res)).intValue();\r
+ count++;\r
+ residueHash.put(res, new Integer(count));\r
+ } else {\r
+ residueHash.put(res, new Integer(1));\r
+ }\r
+ } else {\r
+ if (residueHash.containsKey("-")) {\r
+ int count = ((Integer) residueHash.get("-")).intValue();\r
+ count++;\r
+ residueHash.put("-", new Integer(count));\r
+ } else {\r
+ residueHash.put("-", new Integer(1));\r
+ }\r
+ }\r
+ }\r
+ }\r
\r
- //loop over all the found residues\r
- Enumeration e = residueHash.keys();\r
+ //What is the count threshold to count the residues in residueHash()\r
+ int thresh = (threshold * (sequences.size())) / 100;\r
+\r
+ //loop over all the found residues\r
+ Enumeration e = residueHash.keys();\r
+\r
+ while (e.hasMoreElements()) {\r
+ String res = (String) e.nextElement();\r
+\r
+ if (((Integer) residueHash.get(res)).intValue() > thresh) {\r
+ //Now loop over the properties\r
+ Enumeration e2 = propHash.keys();\r
+\r
+ while (e2.hasMoreElements()) {\r
+ String type = (String) e2.nextElement();\r
+ Hashtable ht = (Hashtable) propHash.get(type);\r
+\r
+ //Have we ticked this before?\r
+ if (!resultHash.containsKey(type)) {\r
+ if (ht.containsKey(res)) {\r
+ resultHash.put(type, ht.get(res));\r
+ } else {\r
+ resultHash.put(type, ht.get("-"));\r
+ }\r
+ } else if (((Integer) resultHash.get(type)).equals(\r
+ (Integer) ht.get(res)) == false) {\r
+ resultHash.put(type, new Integer(-1));\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
+ total.addElement(resultHash);\r
+ }\r
+ }\r
\r
- while (e.hasMoreElements()) {\r
+ public int countGaps(int j) {\r
+ int count = 0;\r
\r
- String res = (String)e.nextElement();\r
- if (((Integer)residueHash.get(res)).intValue() > thresh) {\r
+ for (int i = 0; i < sequences.size(); i++) {\r
+ if ((j + 1) > ((Sequence) sequences.elementAt(i)).getSequence()\r
+ .length()) {\r
+ count++;\r
\r
- //Now loop over the properties\r
- Enumeration e2 = propHash.keys();\r
+ continue;\r
+ }\r
\r
- while (e2.hasMoreElements()) {\r
- String type = (String)e2.nextElement();\r
- Hashtable ht = (Hashtable)propHash.get(type);\r
+ char c = ((Sequence) sequences.elementAt(i)).getSequence().charAt(j);\r
\r
- //Have we ticked this before?\r
- if (! resultHash.containsKey(type)) {\r
- if (ht.containsKey(res)) {\r
- resultHash.put(type,ht.get(res));\r
- } else {\r
- resultHash.put(type,ht.get("-"));\r
- }\r
- } else if ( ((Integer)resultHash.get(type)).equals((Integer)ht.get(res)) == false) {\r
- resultHash.put(type,new Integer(-1));\r
+ if (jalview.util.Comparison.isGap((c))) {\r
+ count++;\r
}\r
- }\r
}\r
- }\r
\r
- total.addElement(resultHash);\r
+ return count;\r
}\r
- }\r
\r
- public int countGaps(int j)\r
- {\r
- int count = 0;\r
+ /***\r
+ * countConsNGaps\r
+ * returns gap count in int[0], and conserved residue count in int[1]\r
+ */\r
+ public int[] countConsNGaps(int j) {\r
+ int count = 0;\r
+ int cons = 0;\r
+ int nres = 0;\r
+ int[] r = new int[2];\r
+ char f = '$';\r
+\r
+ for (int i = 0; i < sequences.size(); i++) {\r
+ if (j >= ((Sequence) sequences.elementAt(i)).getSequence().length()) {\r
+ count++;\r
+\r
+ continue;\r
+ }\r
\r
- for (int i = 0; i < sequences.size();i++)\r
- {\r
- if( j+1 > ((Sequence)sequences.elementAt(i)).getSequence().length())\r
- { count++; continue;}\r
+ char c = ((Sequence) sequences.elementAt(i)).getSequence().charAt(j);\r
+\r
+ if (jalview.util.Comparison.isGap((c))) {\r
+ count++;\r
+ } else {\r
+ nres++;\r
+\r
+ if (nres == 1) {\r
+ f = c;\r
+ cons++;\r
+ } else if (f == c) {\r
+ cons++;\r
+ }\r
+ }\r
+ }\r
\r
- char c = ((Sequence)sequences.elementAt(i)).getSequence().charAt(j);\r
- if (jalview.util.Comparison.isGap((c)))\r
- count++;\r
+ r[0] = (nres == cons) ? 1 : 0;\r
+ r[1] = count;\r
\r
+ return r;\r
}\r
- return count;\r
- }\r
- /***\r
- * countConsNGaps\r
- * returns gap count in int[0], and conserved residue count in int[1]\r
- */\r
- public int[] countConsNGaps(int j)\r
- {\r
- int count = 0;\r
- int cons=0;\r
- int nres = 0;\r
- int[] r = new int[2];\r
- char f='$';\r
- for (int i = 0; i < sequences.size();i++)\r
- {\r
- if( j >= ((Sequence)sequences.elementAt(i)).getSequence().length())\r
- { count++;\r
- continue;}\r
-\r
- char c = ((Sequence)sequences.elementAt(i)).getSequence().charAt(j);\r
- if (jalview.util.Comparison.isGap((c)))\r
- count++;\r
- else {\r
- nres++;\r
- if (nres==1) {\r
- f = c;\r
- cons++;\r
- } else\r
- if (f == c) {\r
- cons++;\r
- }\r
- }\r
+\r
+ public void verdict(boolean consflag, float percentageGaps) {\r
+ String consString = "";\r
+\r
+ for (int i = start; i <= end; i++) {\r
+ int[] gapcons = countConsNGaps(i);\r
+ boolean cons = (gapcons[0] == 1) ? true : false;\r
+ int totGaps = gapcons[1];\r
+ float pgaps = ((float) totGaps * 100) / (float) sequences.size();\r
+\r
+ // System.out.println("percentage gaps = "+pgaps+"\n");\r
+ if (percentageGaps > pgaps) {\r
+ Hashtable resultHash = (Hashtable) total.elementAt(i - start);\r
+\r
+ //Now find the verdict\r
+ int count = 0;\r
+ Enumeration e3 = resultHash.keys();\r
+\r
+ while (e3.hasMoreElements()) {\r
+ String type = (String) e3.nextElement();\r
+ Integer result = (Integer) resultHash.get(type);\r
+\r
+ //Do we want to count +ve conservation or +ve and -ve cons.?\r
+ if (consflag) {\r
+ if (result.intValue() == 1) {\r
+ count++;\r
+ }\r
+ } else {\r
+ if (result.intValue() != -1) {\r
+ count++;\r
+ }\r
+ }\r
+ }\r
+\r
+ if (count < 10) {\r
+ consString = consString + String.valueOf(count); // Conserved props!=Identity\r
+ } else {\r
+ consString = consString + ((gapcons[0] == 1) ? "*" : "+");\r
+ }\r
+ } else {\r
+ consString = consString + "-";\r
+ }\r
+ }\r
+\r
+ consSequence = new Sequence(name, consString, start, end);\r
}\r
- r[0] = (nres==cons) ? 1 : 0;\r
- r[1] = count;\r
\r
+ public Sequence getConsSequence() {\r
+ return consSequence;\r
+ }\r
\r
- return r;\r
- }\r
+ // From Alignment.java in jalview118\r
+ public void findQuality() {\r
+ findQuality(0, maxLength - 1);\r
+ }\r
\r
- public void verdict(boolean consflag, float percentageGaps) {\r
- String consString = "";\r
+ private void percentIdentity2() {\r
+ calcSeqNums(); // updates maxLength, too.\r
\r
- for (int i=start; i <= end; i++) {\r
- int[] gapcons = countConsNGaps(i);\r
- boolean cons = (gapcons[0]==1) ? true : false;\r
- int totGaps = gapcons[1];\r
- float pgaps = (float)totGaps*100/(float)sequences.size();\r
- // System.out.println("percentage gaps = "+pgaps+"\n");\r
- if (percentageGaps > pgaps)\r
- {\r
- Hashtable resultHash = (Hashtable)total.elementAt(i-start);\r
-\r
- //Now find the verdict\r
- int count = 0;\r
- Enumeration e3 = resultHash.keys();\r
-\r
- while (e3.hasMoreElements())\r
- {\r
- String type = (String)e3.nextElement();\r
- Integer result = (Integer)resultHash.get(type);\r
-\r
- //Do we want to count +ve conservation or +ve and -ve cons.?\r
-\r
- if (consflag)\r
- {\r
- if (result.intValue() == 1)\r
- count++;\r
- }\r
- else\r
- {\r
- if (result.intValue() != -1)\r
- count++;\r
- }\r
- }\r
+ if ((cons2 == null) || seqNumsChanged) {\r
+ cons2 = new int[maxLength][24];\r
\r
- if (count < 10)\r
- consString = consString + String.valueOf(count);// Conserved props!=Identity\r
- else\r
- consString = consString + ((gapcons[0]==1) ? "*" : "+");\r
+ // Initialize the array\r
+ for (int j = 0; j < 24; j++) {\r
+ for (int i = 0; i < maxLength; i++) {\r
+ cons2[i][j] = 0;\r
+ }\r
+ }\r
\r
- }\r
- else\r
- {\r
- consString = consString + "-";\r
- }\r
- }\r
+ int[] sqnum;\r
+ int j = 0;\r
\r
- consSequence = new Sequence(name,consString,start,end);\r
- }\r
+ while (j < sequences.size()) {\r
+ sqnum = (int[]) seqNums.elementAt(j);\r
\r
- public Sequence getConsSequence() {\r
- return consSequence;\r
- }\r
+ for (int i = 1; i < sqnum.length; i++) {\r
+ cons2[i - 1][sqnum[i]]++;\r
+ }\r
\r
- // From Alignment.java in jalview118\r
+ for (int i = sqnum.length - 1; i < maxLength; i++) {\r
+ cons2[i][23]++; // gap count\r
+ }\r
\r
- public void findQuality() {\r
- findQuality(0,maxLength-1);\r
- }\r
+ j++;\r
+ }\r
\r
- int[][] cons2;\r
+ // unnecessary ?\r
\r
- private void percentIdentity2() {\r
- calcSeqNums(); // updates maxLength, too.\r
- if (cons2==null || seqNumsChanged) {\r
- cons2 = new int[maxLength][24];\r
- // Initialize the array\r
- for (int j=0;j<24;j++) {\r
- for (int i=0; i < maxLength;i++) {\r
- cons2[i][j] = 0;\r
- }\r
- }\r
-\r
- int sqnum[];\r
- int j = 0;\r
- while(j < sequences.size()) {\r
- sqnum=(int[])seqNums.elementAt(j);\r
- for (int i = 1; i < sqnum.length; i++) {\r
- cons2[i-1][sqnum[i]]++;\r
- }\r
- for (int i=sqnum.length-1; i<maxLength; i++) {\r
- cons2[i][23]++; // gap count\r
- }\r
- j++;\r
- }\r
-\r
- // unnecessary ?\r
- /* for (int i=start; i <= end; i++) {\r
- int max = -1000;\r
- int maxi = -1;\r
- int maxj = -1;\r
-\r
- for (int j=0;j<24;j++) {\r
- if (cons2[i][j] > max) {\r
- max = cons2[i][j];\r
- maxi = i;\r
- maxj = j;\r
- }\r
+ /* for (int i=start; i <= end; i++) {\r
+ int max = -1000;\r
+ int maxi = -1;\r
+ int maxj = -1;\r
\r
- }\r
- } */\r
+ for (int j=0;j<24;j++) {\r
+ if (cons2[i][j] > max) {\r
+ max = cons2[i][j];\r
+ maxi = i;\r
+ maxj = j;\r
+ }\r
+\r
+ }\r
+ } */\r
+ }\r
}\r
\r
-}\r
+ public void findQuality(int start, int end) {\r
+ quality = new Vector();\r
+\r
+ double max = -10000;\r
+ String s = "";\r
+ int[][] BLOSUM62 = jalview.schemes.ResidueProperties.getBLOSUM62();\r
+\r
+ //Loop over columns // JBPNote Profiling info\r
+ // long ts = System.currentTimeMillis();\r
+ //long te = System.currentTimeMillis();\r
+ percentIdentity2();\r
+\r
+ int size = seqNums.size();\r
+ int[] lengths = new int[size];\r
+\r
+ for (int l = 0; l < size; l++)\r
+ lengths[l] = ((int[]) seqNums.elementAt(l)).length - 1;\r
+\r
+ for (int j = start; j <= end; j++) {\r
+ double bigtot = 0;\r
+\r
+ // First Xr = depends on column only\r
+ double[] x = new double[24];\r
+\r
+ for (int ii = 0; ii < 24; ii++) {\r
+ x[ii] = 0;\r
\r
+ try {\r
+ for (int i2 = 0; i2 < 24; i2++) {\r
+ x[ii] += (((double) cons2[j][i2] * BLOSUM62[ii][i2]) +\r
+ 4);\r
+ }\r
+ } catch (Exception e) {\r
+ System.err.println("Exception during quality calculation.");\r
+ e.printStackTrace();\r
+ }\r
\r
-public void findQuality(int start, int end) {\r
- quality = new Vector();\r
- double max = -10000;\r
- String s = "";\r
- int[][] BLOSUM62 = jalview.schemes.ResidueProperties.getBLOSUM62();\r
- //Loop over columns // JBPNote Profiling info\r
- // long ts = System.currentTimeMillis();\r
- //long te = System.currentTimeMillis();\r
- percentIdentity2();\r
-\r
- int size = seqNums.size();\r
- int[] lengths = new int[size];\r
-\r
- for (int l = 0; l < size; l++)\r
- lengths[l] = ((int[]) seqNums.elementAt(l)).length-1;\r
-\r
- for (int j=start; j <= end; j++) {\r
- double bigtot = 0;\r
-\r
- // First Xr = depends on column only\r
- double x[] = new double[24];\r
-\r
- for (int ii=0; ii < 24; ii++) {\r
- x[ii] = 0;\r
- try {\r
- for (int i2=0; i2 < 24; i2++) {\r
- x[ii] += (double)cons2[j][i2] * BLOSUM62[ii][i2]+4;\r
- }\r
- } catch (Exception e) {\r
- System.err.println("Exception during quality calculation.");\r
- e.printStackTrace();\r
- }\r
- //System.out.println("X " + ii + " " + x[ii]);\r
- x[ii] /= (size);\r
- //System.out.println("X " + ii + " " + x[ii]);\r
- }\r
- // Now calculate D for each position and sum\r
- for (int k=0; k < size; k++) {\r
- double tot = 0;\r
- double[] xx = new double[24];\r
- int seqNum =\r
- (j<lengths[k])\r
- ? ((int[]) seqNums.elementAt(k))[j+1]\r
- : 23; // Sequence, or gap at the end\r
-\r
- // This is a loop over r\r
- for (int i=0; i < 23; i++) {\r
- double sr = 0;\r
- try {\r
- sr = (double)BLOSUM62[i][seqNum]+4;\r
- } catch (Exception e) {\r
- System.out.println("Exception in sr: " + e);\r
- e.printStackTrace();\r
- }\r
- //Calculate X with another loop over residues\r
-\r
- // System.out.println("Xi " + i + " " + x[i] + " " + sr);\r
- xx[i] = x[i] - sr;\r
-\r
- tot += xx[i]*xx[i];\r
+ //System.out.println("X " + ii + " " + x[ii]);\r
+ x[ii] /= (size);\r
+\r
+ //System.out.println("X " + ii + " " + x[ii]);\r
+ }\r
+\r
+ // Now calculate D for each position and sum\r
+ for (int k = 0; k < size; k++) {\r
+ double tot = 0;\r
+ double[] xx = new double[24];\r
+ int seqNum = (j < lengths[k])\r
+ ? ((int[]) seqNums.elementAt(k))[j + 1] : 23; // Sequence, or gap at the end\r
+\r
+ // This is a loop over r\r
+ for (int i = 0; i < 23; i++) {\r
+ double sr = 0;\r
+\r
+ try {\r
+ sr = (double) BLOSUM62[i][seqNum] + 4;\r
+ } catch (Exception e) {\r
+ System.out.println("Exception in sr: " + e);\r
+ e.printStackTrace();\r
+ }\r
+\r
+ //Calculate X with another loop over residues\r
+ // System.out.println("Xi " + i + " " + x[i] + " " + sr);\r
+ xx[i] = x[i] - sr;\r
+\r
+ tot += (xx[i] * xx[i]);\r
+ }\r
+\r
+ bigtot += Math.sqrt(tot);\r
+ }\r
+\r
+ // This is the quality for one column\r
+ if (max < bigtot) {\r
+ max = bigtot;\r
+ }\r
+\r
+ // bigtot = bigtot * (size-cons2[j][23])/size;\r
+ quality.addElement(new Double(bigtot));\r
+\r
+ s += "-";\r
+\r
+ // Need to normalize by gaps\r
}\r
- bigtot += Math.sqrt(tot);\r
- }\r
- // This is the quality for one column\r
- if (max < bigtot) {max = bigtot;}\r
- // bigtot = bigtot * (size-cons2[j][23])/size;\r
\r
- quality.addElement(new Double(bigtot));\r
+ double newmax = -10000;\r
\r
- s += "-";\r
+ for (int j = start; j <= end; j++) {\r
+ double tmp = ((Double) quality.elementAt(j)).doubleValue();\r
+ tmp = ((max - tmp) * (size - cons2[j][23])) / size;\r
\r
- // Need to normalize by gaps\r
- }\r
- double newmax=-10000;\r
- for (int j=start; j <= end; j++) {\r
- double tmp = ((Double)quality.elementAt(j)).doubleValue();\r
- tmp = (max - tmp)*(size-cons2[j][23])/size;\r
- // System.out.println(tmp+ " " + j);\r
- quality.setElementAt(new Double(tmp),j);\r
- if (tmp>newmax)\r
- newmax = tmp;\r
- }\r
- // System.out.println("Quality " + s);\r
- qualityRange[0] = new Double(0);\r
- qualityRange[1] = new Double(newmax);\r
- }\r
+ // System.out.println(tmp+ " " + j);\r
+ quality.setElementAt(new Double(tmp), j);\r
\r
+ if (tmp > newmax) {\r
+ newmax = tmp;\r
+ }\r
+ }\r
\r
+ // System.out.println("Quality " + s);\r
+ qualityRange[0] = new Double(0);\r
+ qualityRange[1] = new Double(newmax);\r
+ }\r
}\r
git://source.jalview.org / jalview.git / blobdiff