X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FConservation.java;h=2a065f6cb37fd8adff3d8ad6cccec467af3463a8;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=52d75177a9f065c1b89a2f2eda4c011e8072119e;hpb=dd427b1bd851c9a08a27ffb3fdf4bd60073dff96;p=jalview.git
diff --git a/src/jalview/analysis/Conservation.java b/src/jalview/analysis/Conservation.java
index 52d7517..2a065f6 100755
--- a/src/jalview/analysis/Conservation.java
+++ b/src/jalview/analysis/Conservation.java
@@ -1,20 +1,19 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, 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 file is part of Jalview.
*
- * 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.
+ * Jalview 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 3 of the License, or (at your option) any later version.
*
- * 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
+ * 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 .
*/
package jalview.analysis;
@@ -73,18 +72,17 @@ public class Conservation
* Creates a new Conservation object.
*
* @param name
- * Name of conservation
+ * Name of conservation
* @param propHash
- * hash of properties for each symbol
+ * hash of properties for each symbol
* @param threshold
- * to count the residues in residueHash(). commonly used value
- * is 3
+ * to count the residues in residueHash(). commonly used value is 3
* @param sequences
- * sequences to be used in calculation
+ * sequences to be used in calculation
* @param start
- * start residue position
+ * start residue position
* @param end
- * end residue position
+ * end residue position
*/
public Conservation(String name, Hashtable propHash, int threshold,
Vector sequences, int start, int end)
@@ -102,7 +100,7 @@ public class Conservation
int s, sSize = sequences.size();
SequenceI[] sarray = new SequenceI[sSize];
this.sequences = sarray;
-
+ try {
for (s = 0; s < sSize; s++)
{
sarray[s] = (SequenceI) sequences.elementAt(s);
@@ -111,6 +109,12 @@ public class Conservation
maxLength = sarray[s].getLength();
}
}
+ } catch (ArrayIndexOutOfBoundsException ex)
+ {
+ // bail - another thread has modified the sequence array, so the current calculation is probably invalid.
+ this.sequences=new SequenceI[0];
+ maxLength=0;
+ }
}
/**
@@ -273,7 +277,9 @@ public class Conservation
}
}
- total[i - start] = resultHash;
+ if (total.length>0) {
+ total[i - start] = resultHash;
+ }
}
}
@@ -332,10 +338,10 @@ public class Conservation
* Calculates the conservation sequence
*
* @param consflag
- * if true, poitiveve conservation; false calculates negative
- * conservation
+ * if true, poitiveve conservation; false calculates negative
+ * conservation
* @param percentageGaps
- * commonly used value is 25
+ * commonly used value is 25
*/
public void verdict(boolean consflag, float percentageGaps)
{
@@ -489,9 +495,9 @@ public class Conservation
* Calculates the quality of the set of sequences
*
* @param start
- * Start residue
+ * Start residue
* @param end
- * End residue
+ * End residue
*/
public void findQuality(int start, int end)
{
@@ -594,12 +600,18 @@ public class Conservation
}
/**
- * complete the given consensus and quuality annotation rows.
- * Note: currently this method will enlarge the given annotation row if it is too small, otherwise will leave its length unchanged.
- * @param conservation conservation annotation row
- * @param quality2 (optional - may be null)
- * @param istart first column for conservation
- * @param alWidth extent of conservation
+ * complete the given consensus and quuality annotation rows. Note: currently
+ * this method will enlarge the given annotation row if it is too small,
+ * otherwise will leave its length unchanged.
+ *
+ * @param conservation
+ * conservation annotation row
+ * @param quality2
+ * (optional - may be null)
+ * @param istart
+ * first column for conservation
+ * @param alWidth
+ * extent of conservation
*/
public void completeAnnotations(AlignmentAnnotation conservation,
AlignmentAnnotation quality2, int istart, int alWidth)
@@ -617,7 +629,7 @@ public class Conservation
maxR = 1.0f - minR;
maxG = 0.9f - minG;
maxB = 0f - minB; // scalable range for colouring both Conservation and
- // Quality
+ // Quality
float min = 0f;
float max = 11f;
@@ -626,14 +638,18 @@ public class Conservation
char c;
- if (conservation.annotations !=null && conservation.annotations.length