fixes exception (array index out of bounds - due to off by one error) when applying...
authorjprocter <Jim Procter>
Wed, 11 Oct 2006 09:53:46 +0000 (09:53 +0000)
committerjprocter <Jim Procter>
Wed, 11 Oct 2006 09:53:46 +0000 (09:53 +0000)
src/jalview/analysis/Conservation.java

index d1b508b..0af0689 100755 (executable)
-/*\r
-* Jalview - A Sequence Alignment Editor and Viewer\r
-* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
-*\r
-* This program is free software; you can redistribute it and/or\r
-* modify it under the terms of the GNU General Public License\r
-* as published by the Free Software Foundation; either version 2\r
-* of the License, or (at your option) any later version.\r
-*\r
-* This program is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* 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
-package jalview.analysis;\r
-\r
-import jalview.datamodel.*;\r
-\r
-import java.util.*;\r
-\r
-\r
-/**\r
- * Calculates conservation values for a given set of sequences\r
- *\r
- * @author $author$\r
- * @version $Revision$\r
- */\r
-public class Conservation\r
-{\r
-    SequenceI [] 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
-    Hashtable [] total;\r
-\r
-    /** Stores calculated quality values */\r
-    public Vector quality;\r
-\r
-    /** Stores maximum and minimum values of quality values  */\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
-    /**\r
-     * Creates a new Conservation object.\r
-     *\r
-     * @param name Name of conservation\r
-     * @param propHash DOCUMENT ME!\r
-     * @param threshold to count the residues in residueHash(). commonly used value is 3\r
-     * @param sequences sequences to be used in calculation\r
-     * @param start start residue position\r
-     * @param end end residue position\r
-     */\r
-    public Conservation(String name, Hashtable propHash, int threshold,\r
-        Vector sequences, int start, int end)\r
-    {\r
-\r
-        this.name = name;\r
-        this.propHash = propHash;\r
-        this.threshold = threshold;\r
-        this.start = start;\r
-        this.end = end;\r
-\r
-\r
-        int s, sSize = sequences.size();\r
-        SequenceI[] sarray = new SequenceI[sSize];\r
-        this.sequences = sarray;\r
-\r
-        for (s = 0; s < sSize; s++)\r
-        {\r
-          sarray[s] = (SequenceI) sequences.elementAt(s);\r
-          if(sarray[s].getLength()>maxLength)\r
-            maxLength = sarray[s].getLength();\r
-        }\r
-    }\r
-\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     *\r
-     * @param i DOCUMENT ME!\r
-     */\r
-    private void calcSeqNum(int i)\r
-    {\r
-        String sq = null; // for dumb jbuilder not-inited exception warning\r
-        int[] sqnum = null;\r
-\r
-        int sSize = sequences.length;\r
-\r
-        if ((i > -1) && (i < sSize))\r
-        {\r
-            sq = sequences[i].getSequence();\r
-\r
-            if (seqNums.size() <= i)\r
-            {\r
-                seqNums.addElement(new int[sq.length() + 1]);\r
-            }\r
-\r
-            if (sq.hashCode() != ((int[]) seqNums.elementAt(i))[0])\r
-            {\r
-                int j;\r
-                int len;\r
-                seqNumsChanged = true;\r
-                len = sq.length();\r
-\r
-                if (maxLength < len)\r
-                {\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
-                {\r
-                    sqnum[j] = jalview.schemes.ResidueProperties.aaIndex[sq.charAt(j-1)];\r
-                }\r
-\r
-\r
-                seqNums.setElementAt(sqnum, i);\r
-            }\r
-            else\r
-              System.out.println("NEVER THE EXCEPTION");\r
-        }\r
-        else\r
-        {\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
-     * Calculates the conservation values for given set of sequences\r
-     */\r
-    public void calculate()\r
-    {\r
-      Hashtable resultHash, ht;\r
-      int thresh, j, jSize = sequences.length;\r
-      int[] values; // Replaces residueHash\r
-      String type, res=null;\r
-      char c;\r
-      Enumeration enumeration2;\r
-\r
-      total = new Hashtable[maxLength];\r
-\r
-      for (int i = start; i <= end; i++)\r
-        {\r
-            values = new int[132];\r
-\r
-            for (j = 0; j < jSize; j++)\r
-            {\r
-              if (sequences[j].getLength() > i)\r
-              {\r
-                c = sequences[j].getCharAt(i);\r
-\r
-                // No need to check if its a '-'\r
-                if (c == '.' || c == ' ')\r
-                  c = '-';\r
-\r
-                if ('a' <= c && c <= 'z')\r
-                {\r
-                  c -= (32);// 32 = 'a' - 'A'\r
-                }\r
-\r
-                values[c]++;\r
-              }\r
-              else\r
-              {\r
-                values['-']++;\r
-              }\r
-            }\r
-\r
-            //What is the count threshold to count the residues in residueHash()\r
-            thresh = (threshold * (jSize)) / 100;\r
-\r
-            //loop over all the found residues\r
-            resultHash = new Hashtable();\r
-            for (int v = '-'; v < 'Z'; v++)\r
-            {\r
-\r
-                if (values[v] > thresh)\r
-                {\r
-                  res =  String.valueOf( (char) v);\r
-\r
-                    //Now loop over the properties\r
-                    enumeration2 = propHash.keys();\r
-\r
-                    while (enumeration2.hasMoreElements())\r
-                    {\r
-                        type = (String) enumeration2.nextElement();\r
-                        ht = (Hashtable) propHash.get(type);\r
-\r
-                        //Have we ticked this before?\r
-                        if (!resultHash.containsKey(type))\r
-                        {\r
-                            if (ht.containsKey(res))\r
-                            {\r
-                                resultHash.put(type, ht.get(res));\r
-                            }\r
-                            else\r
-                            {\r
-                                resultHash.put(type, ht.get("-"));\r
-                            }\r
-                        }\r
-                        else if (((Integer) resultHash.get(type)).equals(\r
-                                    (Integer) ht.get(res)) == false)\r
-                        {\r
-                            resultHash.put(type, new Integer(-1));\r
-                        }\r
-                    }\r
-                }\r
-            }\r
-\r
-            total[i] = resultHash;\r
-        }\r
-    }\r
-\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
-        int i, iSize = sequences.length;\r
-        char c;\r
-\r
-        for (i = 0; i < iSize; i++)\r
-        {\r
-            if (j >= sequences[i].getLength())\r
-            {\r
-                count++;\r
-                continue;\r
-            }\r
-\r
-            c = sequences[i].getCharAt(j); // gaps do not have upper/lower case\r
-\r
-            if (jalview.util.Comparison.isGap((c)))\r
-            {\r
-                count++;\r
-            }\r
-            else\r
-            {\r
-                nres++;\r
-\r
-                if (nres == 1)\r
-                {\r
-                    f = c;\r
-                    cons++;\r
-                }\r
-                else if (f == c)\r
-                {\r
-                    cons++;\r
-                }\r
-            }\r
-        }\r
-\r
-        r[0] = (nres == cons) ? 1 : 0;\r
-        r[1] = count;\r
-\r
-        return r;\r
-    }\r
-\r
-    /**\r
-     * Calculates the conservation sequence\r
-     *\r
-     * @param consflag if true, poitiveve conservation; false calculates negative conservation\r
-     * @param percentageGaps commonly used value is 25\r
-     */\r
-    public void verdict(boolean consflag, float percentageGaps)\r
-    {\r
-        StringBuffer consString = new StringBuffer();\r
-        String type;\r
-        Integer result;\r
-        int[] gapcons;\r
-        int totGaps, count;\r
-        float pgaps;\r
-        Hashtable resultHash ;\r
-        Enumeration enumeration;\r
-\r
-\r
-        for (int i = start; i <= end; i++)\r
-        {\r
-            gapcons = countConsNGaps(i);\r
-            totGaps = gapcons[1];\r
-            pgaps = ((float) totGaps * 100) / (float) sequences.length;\r
-\r
-            if (percentageGaps > pgaps)\r
-            {\r
-                resultHash =  total[i - start];\r
-\r
-                //Now find the verdict\r
-                count = 0;\r
-                enumeration = resultHash.keys();\r
-\r
-                while (enumeration.hasMoreElements())\r
-                {\r
-                   type = (String) enumeration.nextElement();\r
-                   result = (Integer) resultHash.get(type);\r
-\r
-                    //Do we want to count +ve conservation or +ve and -ve cons.?\r
-                    if (consflag)\r
-                    {\r
-                        if (result.intValue() == 1)\r
-                        {\r
-                            count++;\r
-                        }\r
-                    }\r
-                    else\r
-                    {\r
-                        if (result.intValue() != -1)\r
-                        {\r
-                            count++;\r
-                        }\r
-                    }\r
-                }\r
-\r
-                if (count < 10)\r
-                {\r
-                    consString.append(count); // Conserved props!=Identity\r
-                }\r
-                else\r
-                {\r
-                    consString.append((gapcons[0] == 1) ? "*" : "+");\r
-                }\r
-            }\r
-            else\r
-            {\r
-                consString.append("-");\r
-            }\r
-        }\r
-\r
-        consSequence = new Sequence(name, consString.toString(), start, end);\r
-    }\r
-\r
-    /**\r
-     *\r
-     *\r
-     * @return Conservation sequence\r
-     */\r
-    public Sequence getConsSequence()\r
-    {\r
-        return consSequence;\r
-    }\r
-\r
-    // From Alignment.java in jalview118\r
-    public void findQuality()\r
-    {\r
-        findQuality(0, maxLength - 1);\r
-    }\r
-\r
-    /**\r
-     * DOCUMENT ME!\r
-     */\r
-    private void percentIdentity2()\r
-    {\r
-      seqNums = new Vector();\r
-     // calcSeqNum(s);\r
-      int i = 0, iSize = sequences.length;\r
-    //Do we need to calculate this again?\r
-      for (i = 0; i < iSize; i++)\r
-      {\r
-       calcSeqNum(i);\r
-      }\r
-\r
-\r
-        if ((cons2 == null) || seqNumsChanged)\r
-        {\r
-            cons2 = new int[maxLength][24];\r
-\r
-            // Initialize the array\r
-            for (int j = 0; j < 24; j++)\r
-            {\r
-                for (i = 0; i < maxLength; i++)\r
-                {\r
-                    cons2[i][j] = 0;\r
-                }\r
-            }\r
-\r
-            int[] sqnum;\r
-            int j = 0;\r
-\r
-            while (j < sequences.length)\r
-            {\r
-                sqnum = (int[]) seqNums.elementAt(j);\r
-\r
-                for (i = 1; i < sqnum.length; i++)\r
-                {\r
-                    cons2[i - 1][sqnum[i]]++;\r
-                }\r
-\r
-                for (i = sqnum.length - 1; i < maxLength; i++)\r
-                {\r
-                    cons2[i][23]++; // gap count\r
-                }\r
-\r
-                j++;\r
-            }\r
-\r
-            // unnecessary ?\r
-\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
-\r
-            }\r
-            } */\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Calculates the quality of the set of sequences\r
-     *\r
-     * @param start Start residue\r
-     * @param end End residue\r
-     */\r
-    public void findQuality(int start, int end)\r
-    {\r
-        quality = new Vector();\r
-\r
-        double max = -10000;\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
-        double tot, bigtot, sr, tmp;\r
-        double [] x, xx;\r
-        int l, j, i, ii, i2, k, seqNum;\r
-\r
-        for (l = 0; l < size; l++)\r
-            lengths[l] = ((int[]) seqNums.elementAt(l)).length - 1;\r
-\r
-        for (j = start; j <= end; j++)\r
-        {\r
-            bigtot = 0;\r
-\r
-            // First Xr = depends on column only\r
-            x = new double[24];\r
-\r
-            for (ii = 0; ii < 24; ii++)\r
-            {\r
-                x[ii] = 0;\r
-\r
-                for (i2 = 0; i2 < 24; i2++)\r
-                {\r
-                  x[ii] += ( ( (double) cons2[j][i2] * BLOSUM62[ii][i2]) +\r
-                            4);\r
-                }\r
-\r
-                x[ii] /= size;\r
-            }\r
-\r
-            // Now calculate D for each position and sum\r
-            for (k = 0; k < size; k++)\r
-            {\r
-                tot = 0;\r
-                xx = new double[24];\r
-                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 (i = 0; i < 23; i++)\r
-                {\r
-                    sr = 0;\r
-\r
-                    sr = (double) BLOSUM62[i][seqNum] + 4;\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
-            {\r
-                max = bigtot;\r
-            }\r
-\r
-            //      bigtot  = bigtot * (size-cons2[j][23])/size;\r
-            quality.addElement(new Double(bigtot));\r
-\r
-            // Need to normalize by gaps\r
-        }\r
-\r
-        double newmax = -10000;\r
-\r
-        for (j = start; j <= end; j++)\r
-        {\r
-            tmp = ((Double) quality.elementAt(j)).doubleValue();\r
-            tmp = ((max - tmp) * (size - cons2[j][23])) / size;\r
-\r
-            //     System.out.println(tmp+ " " + j);\r
-            quality.setElementAt(new Double(tmp), j);\r
-\r
-            if (tmp > newmax)\r
-            {\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
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program 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 this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+*/
+package jalview.analysis;
+
+import jalview.datamodel.*;
+
+import java.util.*;
+
+
+/**
+ * Calculates conservation values for a given set of sequences
+ *
+ * @author $author$
+ * @version $Revision$
+ */
+public class Conservation
+{
+    SequenceI [] sequences;
+    int start;
+    int end;
+    Vector seqNums; // vector of int vectors where first is sequence checksum
+    int maxLength = 0; //  used by quality calcs
+    boolean seqNumsChanged = false; // updated after any change via calcSeqNum;
+    Hashtable [] total;
+
+    /** Stores calculated quality values */
+    public Vector quality;
+
+    /** Stores maximum and minimum values of quality values  */
+    public Double[] qualityRange = new Double[2];
+    String consString = "";
+    Sequence consSequence;
+    Hashtable propHash;
+    int threshold;
+    String name = "";
+    int[][] cons2;
+
+    /**
+     * Creates a new Conservation object.
+     *
+     * @param name Name of conservation
+     * @param propHash DOCUMENT ME!
+     * @param threshold to count the residues in residueHash(). commonly used value is 3
+     * @param sequences sequences to be used in calculation
+     * @param start start residue position
+     * @param end end residue position
+     */
+    public Conservation(String name, Hashtable propHash, int threshold,
+        Vector sequences, int start, int end)
+    {
+
+        this.name = name;
+        this.propHash = propHash;
+        this.threshold = threshold;
+        this.start = start;
+        this.end = end;
+
+        maxLength=end-start+1; // default width includes bounds of calculation
+
+        int s, sSize = sequences.size();
+        SequenceI[] sarray = new SequenceI[sSize];
+        this.sequences = sarray;
+
+        for (s = 0; s < sSize; s++)
+        {
+          sarray[s] = (SequenceI) sequences.elementAt(s);
+          if(sarray[s].getLength()>maxLength)
+            maxLength = sarray[s].getLength();
+        }
+    }
+
+
+    /**
+     * DOCUMENT ME!
+     *
+     * @param i DOCUMENT ME!
+     */
+    private void calcSeqNum(int i)
+    {
+        String sq = null; // for dumb jbuilder not-inited exception warning
+        int[] sqnum = null;
+
+        int sSize = sequences.length;
+
+        if ((i > -1) && (i < sSize))
+        {
+            sq = sequences[i].getSequence();
+
+            if (seqNums.size() <= i)
+            {
+                seqNums.addElement(new int[sq.length() + 1]);
+            }
+
+            if (sq.hashCode() != ((int[]) seqNums.elementAt(i))[0])
+            {
+                int j;
+                int len;
+                seqNumsChanged = true;
+                len = sq.length();
+
+                if (maxLength < len)
+                {
+                    maxLength = len;
+                }
+
+                sqnum = new int[len + 1]; // better to always make a new array - sequence can change its length
+                sqnum[0] = sq.hashCode();
+
+                for (j = 1; j <= len; j++)
+                {
+                    sqnum[j] = jalview.schemes.ResidueProperties.aaIndex[sq.charAt(j-1)];
+                }
+
+
+                seqNums.setElementAt(sqnum, i);
+            }
+            else
+              System.out.println("NEVER THE EXCEPTION");
+        }
+        else
+        {
+            // JBPNote INFO level debug
+            System.err.println(
+                "ERROR: calcSeqNum called with out of range sequence index for Alignment\n");
+        }
+    }
+
+    /**
+     * Calculates the conservation values for given set of sequences
+     */
+    public void calculate()
+    {
+      Hashtable resultHash, ht;
+      int thresh, j, jSize = sequences.length;
+      int[] values; // Replaces residueHash
+      String type, res=null;
+      char c;
+      Enumeration enumeration2;
+
+      total = new Hashtable[maxLength];
+
+      for (int i = start; i <= end; i++)
+        {
+            values = new int[132];
+
+            for (j = 0; j < jSize; j++)
+            {
+              if (sequences[j].getLength() > i)
+              {
+                c = sequences[j].getCharAt(i);
+
+                // No need to check if its a '-'
+                if (c == '.' || c == ' ')
+                  c = '-';
+
+                if ('a' <= c && c <= 'z')
+                {
+                  c -= (32);// 32 = 'a' - 'A'
+                }
+
+                values[c]++;
+              }
+              else
+              {
+                values['-']++;
+              }
+            }
+
+            //What is the count threshold to count the residues in residueHash()
+            thresh = (threshold * (jSize)) / 100;
+
+            //loop over all the found residues
+            resultHash = new Hashtable();
+            for (int v = '-'; v < 'Z'; v++)
+            {
+
+                if (values[v] > thresh)
+                {
+                  res =  String.valueOf( (char) v);
+
+                    //Now loop over the properties
+                    enumeration2 = propHash.keys();
+
+                    while (enumeration2.hasMoreElements())
+                    {
+                        type = (String) enumeration2.nextElement();
+                        ht = (Hashtable) propHash.get(type);
+
+                        //Have we ticked this before?
+                        if (!resultHash.containsKey(type))
+                        {
+                            if (ht.containsKey(res))
+                            {
+                                resultHash.put(type, ht.get(res));
+                            }
+                            else
+                            {
+                                resultHash.put(type, ht.get("-"));
+                            }
+                        }
+                        else if (((Integer) resultHash.get(type)).equals(
+                                    (Integer) ht.get(res)) == false)
+                        {
+                            resultHash.put(type, new Integer(-1));
+                        }
+                    }
+                }
+            }
+
+            total[i-start] = resultHash;
+        }
+    }
+
+
+    /***
+     * countConsNGaps
+     * returns gap count in int[0], and conserved residue count in int[1]
+     */
+    public int[] countConsNGaps(int j)
+    {
+        int count = 0;
+        int cons = 0;
+        int nres = 0;
+        int[] r = new int[2];
+        char f = '$';
+        int i, iSize = sequences.length;
+        char c;
+
+        for (i = 0; i < iSize; i++)
+        {
+            if (j >= sequences[i].getLength())
+            {
+                count++;
+                continue;
+            }
+
+            c = sequences[i].getCharAt(j); // gaps do not have upper/lower case
+
+            if (jalview.util.Comparison.isGap((c)))
+            {
+                count++;
+            }
+            else
+            {
+                nres++;
+
+                if (nres == 1)
+                {
+                    f = c;
+                    cons++;
+                }
+                else if (f == c)
+                {
+                    cons++;
+                }
+            }
+        }
+
+        r[0] = (nres == cons) ? 1 : 0;
+        r[1] = count;
+
+        return r;
+    }
+
+    /**
+     * Calculates the conservation sequence
+     *
+     * @param consflag if true, poitiveve conservation; false calculates negative conservation
+     * @param percentageGaps commonly used value is 25
+     */
+    public void verdict(boolean consflag, float percentageGaps)
+    {
+        StringBuffer consString = new StringBuffer();
+        String type;
+        Integer result;
+        int[] gapcons;
+        int totGaps, count;
+        float pgaps;
+        Hashtable resultHash ;
+        Enumeration enumeration;
+
+
+        for (int i = start; i <= end; i++)
+        {
+            gapcons = countConsNGaps(i);
+            totGaps = gapcons[1];
+            pgaps = ((float) totGaps * 100) / (float) sequences.length;
+
+            if (percentageGaps > pgaps)
+            {
+                resultHash =  total[i - start];
+
+                //Now find the verdict
+                count = 0;
+                enumeration = resultHash.keys();
+
+                while (enumeration.hasMoreElements())
+                {
+                   type = (String) enumeration.nextElement();
+                   result = (Integer) resultHash.get(type);
+
+                    //Do we want to count +ve conservation or +ve and -ve cons.?
+                    if (consflag)
+                    {
+                        if (result.intValue() == 1)
+                        {
+                            count++;
+                        }
+                    }
+                    else
+                    {
+                        if (result.intValue() != -1)
+                        {
+                            count++;
+                        }
+                    }
+                }
+
+                if (count < 10)
+                {
+                    consString.append(count); // Conserved props!=Identity
+                }
+                else
+                {
+                    consString.append((gapcons[0] == 1) ? "*" : "+");
+                }
+            }
+            else
+            {
+                consString.append("-");
+            }
+        }
+
+        consSequence = new Sequence(name, consString.toString(), start, end);
+    }
+
+    /**
+     *
+     *
+     * @return Conservation sequence
+     */
+    public Sequence getConsSequence()
+    {
+        return consSequence;
+    }
+
+    // From Alignment.java in jalview118
+    public void findQuality()
+    {
+        findQuality(0, maxLength - 1);
+    }
+
+    /**
+     * DOCUMENT ME!
+     */
+    private void percentIdentity2()
+    {
+      seqNums = new Vector();
+     // calcSeqNum(s);
+      int i = 0, iSize = sequences.length;
+    //Do we need to calculate this again?
+      for (i = 0; i < iSize; i++)
+      {
+       calcSeqNum(i);
+      }
+
+
+        if ((cons2 == null) || seqNumsChanged)
+        {
+            cons2 = new int[maxLength][24];
+
+            // Initialize the array
+            for (int j = 0; j < 24; j++)
+            {
+                for (i = 0; i < maxLength; i++)
+                {
+                    cons2[i][j] = 0;
+                }
+            }
+
+            int[] sqnum;
+            int j = 0;
+
+            while (j < sequences.length)
+            {
+                sqnum = (int[]) seqNums.elementAt(j);
+
+                for (i = 1; i < sqnum.length; i++)
+                {
+                    cons2[i - 1][sqnum[i]]++;
+                }
+
+                for (i = sqnum.length - 1; i < maxLength; i++)
+                {
+                    cons2[i][23]++; // gap count
+                }
+
+                j++;
+            }
+
+            // unnecessary ?
+
+            /* for (int i=start; i <= end; i++) {
+                 int max = -1000;
+            int maxi = -1;
+            int maxj = -1;
+
+            for (int j=0;j<24;j++) {
+              if (cons2[i][j] > max) {
+              max = cons2[i][j];
+              maxi = i;
+              maxj = j;
+            }
+
+            }
+            } */
+        }
+    }
+
+    /**
+     * Calculates the quality of the set of sequences
+     *
+     * @param start Start residue
+     * @param end End residue
+     */
+    public void findQuality(int start, int end)
+    {
+        quality = new Vector();
+
+        double max = -10000;
+        int[][] BLOSUM62 = jalview.schemes.ResidueProperties.getBLOSUM62();
+
+        //Loop over columns // JBPNote Profiling info
+        //long ts = System.currentTimeMillis();
+        //long te = System.currentTimeMillis();
+        percentIdentity2();
+
+        int size = seqNums.size();
+        int[] lengths = new int[size];
+        double tot, bigtot, sr, tmp;
+        double [] x, xx;
+        int l, j, i, ii, i2, k, seqNum;
+
+        for (l = 0; l < size; l++)
+            lengths[l] = ((int[]) seqNums.elementAt(l)).length - 1;
+
+        for (j = start; j <= end; j++)
+        {
+            bigtot = 0;
+
+            // First Xr = depends on column only
+            x = new double[24];
+
+            for (ii = 0; ii < 24; ii++)
+            {
+                x[ii] = 0;
+
+                for (i2 = 0; i2 < 24; i2++)
+                {
+                  x[ii] += ( ( (double) cons2[j][i2] * BLOSUM62[ii][i2]) +
+                            4);
+                }
+
+                x[ii] /= size;
+            }
+
+            // Now calculate D for each position and sum
+            for (k = 0; k < size; k++)
+            {
+                tot = 0;
+                xx = new double[24];
+                seqNum = (j < lengths[k])
+                    ? ((int[]) seqNums.elementAt(k))[j + 1] : 23; // Sequence, or gap at the end
+
+                // This is a loop over r
+                for (i = 0; i < 23; i++)
+                {
+                    sr = 0;
+
+                    sr = (double) BLOSUM62[i][seqNum] + 4;
+
+                    //Calculate X with another loop over residues
+                    //  System.out.println("Xi " + i + " " + x[i] + " " + sr);
+                    xx[i] = x[i] - sr;
+
+                    tot += (xx[i] * xx[i]);
+                }
+
+                bigtot += Math.sqrt(tot);
+            }
+
+            // This is the quality for one column
+            if (max < bigtot)
+            {
+                max = bigtot;
+            }
+
+            //      bigtot  = bigtot * (size-cons2[j][23])/size;
+            quality.addElement(new Double(bigtot));
+
+            // Need to normalize by gaps
+        }
+
+        double newmax = -10000;
+
+        for (j = start; j <= end; j++)
+        {
+            tmp = ((Double) quality.elementAt(j)).doubleValue();
+            tmp = ((max - tmp) * (size - cons2[j][23])) / size;
+
+            //     System.out.println(tmp+ " " + j);
+            quality.setElementAt(new Double(tmp), j);
+
+            if (tmp > newmax)
+            {
+                newmax = tmp;
+            }
+        }
+
+        //    System.out.println("Quality " + s);
+        qualityRange[0] = new Double(0);
+        qualityRange[1] = new Double(newmax);
+    }
+}