X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=02fc54345bf53e3c4473ca36b45b38fe01943120;hb=68a0d4900885cec55096d1f266ee15ef6217f754;hp=635043b6eda8e2b8982dad4dc23132bcddf629bd;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 635043b..02fc543 100755 --- a/src/jalview/datamodel/Sequence.java +++ b/src/jalview/datamodel/Sequence.java @@ -18,7 +18,6 @@ */ package jalview.datamodel; -import java.awt.*; import java.util.*; @@ -31,748 +30,690 @@ import java.util.*; */ public class Sequence implements SequenceI { - SequenceI datasetSequence; - String name; - private String sequence; - String description; - int start; - int end; - Color color = Color.white; - Vector pdbIds; - String vamsasId; - DBRefEntry [] dbrefs; - - /** This annotation is displayed below the alignment but the - * positions are tied to the residues of this sequence */ - Vector annotation; - - /** DOCUMENT ME!! */ - public SequenceFeature [] sequenceFeatures; - - /** This array holds hidden sequences - * of which this sequence is the representitive member of a group - */ - SequenceGroup hiddenSequences; - - /** - * Creates a new Sequence object. - * - * @param name DOCUMENT ME! - * @param sequence DOCUMENT ME! - * @param start DOCUMENT ME! - * @param end DOCUMENT ME! - */ - public Sequence(String name, String sequence, int start, int end) - { - this.name = name; - this.sequence = sequence; - this.start = start; - this.end = end; - - parseId(); + SequenceI datasetSequence; + String name; + private char [] sequence; + String description; + int start; + int end; + Vector pdbIds; + String vamsasId; + DBRefEntry[] dbrefs; + + /** This annotation is displayed below the alignment but the + * positions are tied to the residues of this sequence */ + Vector annotation; + + /** DOCUMENT ME!! */ + public SequenceFeature[] sequenceFeatures; + + + /** + * Creates a new Sequence object. + * + * @param name DOCUMENT ME! + * @param sequence DOCUMENT ME! + * @param start DOCUMENT ME! + * @param end DOCUMENT ME! + */ + public Sequence(String name, String sequence, int start, int end) + { + this.name = name; + this.sequence = sequence.toCharArray(); + this.start = start; + this.end = end; + parseId(); + checkValidRange(); + } - checkValidRange(); - } + public Sequence(String name, char [] sequence, int start, int end) + { + this.name = name; + this.sequence = sequence; + this.start = start; + this.end = end; + parseId(); + checkValidRange(); + } - com.stevesoft.pat.Regex limitrx = new com.stevesoft.pat.Regex( - "[/][0-9]{1,}[-][0-9]{1,}$"); - com.stevesoft.pat.Regex endrx = new com.stevesoft.pat.Regex( - "[0-9]{1,}$"); + com.stevesoft.pat.Regex limitrx = new com.stevesoft.pat.Regex( + "[/][0-9]{1,}[-][0-9]{1,}$"); + com.stevesoft.pat.Regex endrx = new com.stevesoft.pat.Regex( + "[0-9]{1,}$"); - void parseId() + void parseId() + { + // Does sequence have the /start-end signiature? + if (limitrx.search(name)) { - // Does sequence have the /start-end signiature? - if(limitrx.search(name)) - { - name = limitrx.left(); - endrx.search(limitrx.stringMatched()); - setStart( Integer.parseInt( limitrx.stringMatched().substring(1,endrx.matchedFrom()-1 ))); - setEnd( Integer.parseInt( endrx.stringMatched() )); - } + name = limitrx.left(); + endrx.search(limitrx.stringMatched()); + setStart(Integer.parseInt(limitrx.stringMatched().substring(1, + endrx.matchedFrom() - 1))); + setEnd(Integer.parseInt(endrx.stringMatched())); } + } - void checkValidRange() + void checkValidRange() + { + if (end < 1) { - if (end < 1) + int endRes = 0; + for (int j = 0; j < sequence.length; j++) { - int endRes = 0; - char ch; - for (int j = 0; j < sequence.length(); j++) - { - ch = sequence.charAt(j); - if (!jalview.util.Comparison.isGap( (ch))) - { - endRes++; - } - } - if (endRes > 0) + if (!jalview.util.Comparison.isGap( sequence[j] )) { - endRes += start - 1; + endRes++; } - - this.end = endRes; + } + if (endRes > 0) + { + endRes += start - 1; } + this.end = endRes; } - /** - * Creates a new Sequence object. - * - * @param name DOCUMENT ME! - * @param sequence DOCUMENT ME! - */ - public Sequence(String name, String sequence) - { - this(name, sequence, 1, -1); - } - - /** - * Creates a new Sequence object. - * - * @param seq DOCUMENT ME! - */ - public Sequence(SequenceI seq) - { - this(seq.getName(), seq.getSequence(), seq.getStart(), seq.getEnd()); - } - - /** - * DOCUMENT ME! - * - * @param v DOCUMENT ME! - */ - public void setSequenceFeatures(SequenceFeature [] features) - { - sequenceFeatures = features; - } - - public synchronized void addSequenceFeature(SequenceFeature sf) - { - if(sequenceFeatures==null) - { - sequenceFeatures = new SequenceFeature[0]; - } + } - for(int i=0; i= sequence.length()) - { - return ""; - } + /** + * DOCUMENT ME! + * + * @param id DOCUMENT ME! + */ + public void setPDBId(Vector id) + { + pdbIds = id; + } - if (end >= sequence.length()) - { - end = sequence.length(); - } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Vector getPDBId() + { + return pdbIds; + } - return this.sequence.substring(start, end); - } - /** - * make a new Sequence object from start to end (including gaps) over this seqeunce - * @param start int - * @param end int - * @return SequenceI - */ - public SequenceI getSubSequence(int start, int end) { - if (start<0) - start = 0; - String seq = getSequence(start, end); - if (seq=="") - return null; - int nstart = findPosition(start); - int nend=findPosition(end)-1; - // JBPNote - this is an incomplete copy. - SequenceI nseq = new Sequence(this.getName(), seq, nstart, nend); - nseq.setDatasetSequence(getDatasetSequence()); - return nseq; - } - /** - * DOCUMENT ME! - * - * @param i DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public char getCharAt(int i) + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getDisplayId(boolean jvsuffix) + { + StringBuffer result = new StringBuffer(name); + if (jvsuffix) { - if (i < sequence.length()) - { - return sequence.charAt(i); - } - else - { - return ' '; - } + result.append("/" + start + "-" + end); } - /** - * DOCUMENT ME! - * - * @param desc DOCUMENT ME! - */ - public void setDescription(String desc) - { - this.description = desc; - } + return result.toString(); + } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getDescription() - { - return this.description; - } + /** + * DOCUMENT ME! + * + * @param name DOCUMENT ME! + */ + public void setName(String name) + { + this.name = name; + this.parseId(); + } - /** - * DOCUMENT ME! - * - * @param pos DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public int findIndex(int pos) - { - // returns the alignment position for a residue - int j = start; - int i = 0; + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getName() + { + return this.name; + } - while ((i < sequence.length()) && (j <= end) && (j <= pos)) - { - if (!jalview.util.Comparison.isGap(sequence.charAt(i))) - { - j++; - } + /** + * DOCUMENT ME! + * + * @param start DOCUMENT ME! + */ + public void setStart(int start) + { + this.start = start; + } - i++; - } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int getStart() + { + return this.start; + } - if ((j == end) && (j < pos)) - { - return end + 1; - } - else - { - return i; - } - } + /** + * DOCUMENT ME! + * + * @param end DOCUMENT ME! + */ + public void setEnd(int end) + { + this.end = end; + } - /** - * Returns the sequence position for an alignment position - * - * @param i column index in alignment (from 1) - * - * @return residue number for residue (left of and) nearest ith column - */ - public int findPosition(int i) - { - int j = 0; - int pos = start; - int seqlen=sequence.length(); - while ((j < i) && (j < seqlen)) - { - if (!jalview.util.Comparison.isGap((sequence.charAt(j)))) - { - pos++; - } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int getEnd() + { + return this.end; + } - j++; - } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int getLength() + { + return this.sequence.length; + } - return pos; - } + /** + * DOCUMENT ME! + * + * @param seq DOCUMENT ME! + */ + public void setSequence(String seq) + { + this.sequence = seq.toCharArray(); + checkValidRange(); + } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public int[] gapMap() - { - // Returns an int array giving the position of each residue in the sequence in the alignment - String seq = jalview.analysis.AlignSeq.extractGaps(jalview.util.Comparison.GapChars, sequence); - int[] map = new int[seq.length()]; - int j = 0; - int p = 0; - while (j < sequence.length()) - { - if (!jalview.util.Comparison.isGap(sequence.charAt(j))) - { - map[p++] = j; - } + public String getSequenceAsString() + { + return new String(sequence); + } - j++; - } + public String getSequenceAsString(int start, int end) + { + return new String(getSequence(start, end)); + } - return map; - } - /** - * DOCUMENT ME! - * - * @param i DOCUMENT ME! - */ - public void deleteCharAt(int i) - { - if (i >= sequence.length()) - { - return; - } + public char [] getSequence() + { + return sequence; + } - sequence = sequence.substring(0, i) + sequence.substring(i + 1); + /** + * DOCUMENT ME! + * + * @param start DOCUMENT ME! + * @param end DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public char [] getSequence(int start, int end) + { + // JBPNote - left to user to pad the result here (TODO:Decide on this policy) + if (start >= sequence.length) + { + return new char[0]; } - /** - * DOCUMENT ME! - * - * @param i DOCUMENT ME! - * @param j DOCUMENT ME! - */ - public void deleteChars(int i, int j) + if (end >= sequence.length) { - if (i >= sequence.length()) - { - return; - } - - if (j >= sequence.length()) - { - sequence = sequence.substring(0, i); - } - else - { - sequence = sequence.substring(0, i) + sequence.substring(j); - } + end = sequence.length; } + char [] reply = new char[end-start]; + System.arraycopy(sequence, start, reply, 0, end-start); - /** - * DOCUMENT ME! - * - * @param i DOCUMENT ME! - * @param c DOCUMENT ME! - * @param chop DOCUMENT ME! - */ - public void insertCharAt(int i, char c) - { - String tmp = new String(sequence); - - if (i < sequence.length()) - { - sequence = tmp.substring(0, i) + String.valueOf(c) + - tmp.substring(i); - } - else - { - // JBPNote : padding char at end of sequence. We'll not get away with this when we insert residues, I bet! - char[] ch = new char[(1 + i) - sequence.length()]; + return reply; + } - for (int j = 0, k = ch.length; j < k; j++) - ch[j] = c; - sequence = tmp + String.valueOf(ch); - } - } + /** + * make a new Sequence object from start to end (including gaps) over this seqeunce + * @param start int + * @param end int + * @return SequenceI + */ + public SequenceI getSubSequence(int start, int end) + { + if (start < 0) + start = 0; + char [] seq = getSequence(start, end); + if (seq.length == 0) + return null; + int nstart = findPosition(start); + int nend = findPosition(end) - 1; + // JBPNote - this is an incomplete copy. + SequenceI nseq = new Sequence(this.getName(), seq, nstart, nend); + nseq.setDescription(description); + if (datasetSequence!=null) + nseq.setDatasetSequence(datasetSequence); + else + nseq.setDatasetSequence(this); + return nseq; + } - /** - * DOCUMENT ME! - * - * @param c DOCUMENT ME! - */ - public void setColor(Color c) + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public char getCharAt(int i) + { + if (i < sequence.length) { - this.color = c; + return sequence[i]; } - - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public Color getColor() + else { - return color; + return ' '; } + } + + /** + * DOCUMENT ME! + * + * @param desc DOCUMENT ME! + */ + public void setDescription(String desc) + { + this.description = desc; + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getDescription() + { + return this.description; + } + + /** + * DOCUMENT ME! + * + * @param pos DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int findIndex(int pos) + { + // returns the alignment position for a residue + int j = start; + int i = 0; - public String getVamsasId() + while ( (i < sequence.length) && (j <= end) && (j <= pos)) { - return vamsasId; + if (!jalview.util.Comparison.isGap(sequence[i])) + { + j++; + } + + i++; } - public void setVamsasId(String id) + if ( (j == end) && (j < pos)) { - vamsasId = id; + return end + 1; } - - public void setDBRef(DBRefEntry [] dbref) + else { - dbrefs = dbref; + return i; } + } - public DBRefEntry [] getDBRef() + /** + * Returns the sequence position for an alignment position + * + * @param i column index in alignment (from 1) + * + * @return residue number for residue (left of and) nearest ith column + */ + public int findPosition(int i) + { + int j = 0; + int pos = start; + int seqlen = sequence.length; + while ( (j < i) && (j < seqlen)) { - return dbrefs; + if (!jalview.util.Comparison.isGap( sequence[j] )) + { + pos++; + } + + j++; } - public void addDBRef(DBRefEntry entry) - { - if(dbrefs == null) - dbrefs = new DBRefEntry[0]; + return pos; + } - DBRefEntry [] temp = new DBRefEntry[dbrefs.length+1]; - System.arraycopy(dbrefs, 0, temp, 0, dbrefs.length); + /** + * Returns an int array where indices correspond to each residue in the sequence and the element value gives its position in the alignment + * + * @return int[SequenceI.getEnd()-SequenceI.getStart()+1] or null if no residues in SequenceI object + */ + public int[] gapMap() + { + String seq = jalview.analysis.AlignSeq.extractGaps(jalview.util.Comparison. + GapChars, new String(sequence)); + int[] map = new int[seq.length()]; + int j = 0; + int p = 0; - temp[temp.length-1] = entry; + while (j < sequence.length) + { + if (!jalview.util.Comparison.isGap(sequence[j])) + { + map[p++] = j; + } - dbrefs = temp; + j++; } - public void setDatasetSequence(SequenceI seq) + return map; + } + + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * @param j DOCUMENT ME! + */ + public void deleteChars(int i, int j) + { + if (i >= sequence.length) { - datasetSequence = seq; + return; } - public SequenceI getDatasetSequence() + char [] tmp; + + if (j >= sequence.length) { - return datasetSequence; + tmp = new char[i]; + System.arraycopy(sequence,0,tmp,0,i); } - - public AlignmentAnnotation [] getAnnotation() + else { - if(annotation==null) - return null; - - AlignmentAnnotation [] ret = new AlignmentAnnotation[annotation.size()]; - for(int r = 0; r= sequence.length) { - return hiddenSequences; + System.arraycopy(sequence, 0, tmp, 0, sequence.length); + i = sequence.length; } + else + { + System.arraycopy(sequence, 0, tmp, 0, i); + } - public void addHiddenSequence(SequenceI seq) - { - if(hiddenSequences==null) - { - hiddenSequences = new SequenceGroup(); - } - hiddenSequences.addSequence(seq, false); - } - public void showHiddenSequence(SequenceI seq) + int index = i; + while (length > 0) { - hiddenSequences.deleteSequence(seq, false); - if (hiddenSequences.getSize(false) < 1) - { - hiddenSequences = null; - } + tmp[ index++ ] = c; + length--; } - public void changeCase(boolean toUpper, int start, int end) + if (i < sequence.length) { - StringBuffer newSeq = new StringBuffer(); + System.arraycopy(sequence, i, tmp, index, sequence.length-i ); + } - if(end>sequence.length()) - end = sequence.length(); + sequence = tmp; + } - if (start > 0) - { - newSeq.append(sequence.substring(0, start)); - } + public void insertCharAt(int i, char c) + { + insertCharAt(i, 1, c); + } - if (toUpper) - newSeq.append(sequence.substring(start, end).toUpperCase()); - else - newSeq.append(sequence.substring(start, end).toLowerCase()); + public String getVamsasId() + { + return vamsasId; + } - if (end < sequence.length()) - newSeq.append(sequence.substring(end)); + public void setVamsasId(String id) + { + vamsasId = id; + } - sequence = newSeq.toString(); - } + public void setDBRef(DBRefEntry[] dbref) + { + dbrefs = dbref; + } - public void toggleCase(int start, int end) - { - StringBuffer newSeq = new StringBuffer(); + public DBRefEntry[] getDBRef() + { + return dbrefs; + } - if(end>sequence.length()) - end = sequence.length(); + public void addDBRef(DBRefEntry entry) + { + if (dbrefs == null) + dbrefs = new DBRefEntry[0]; - if (start > 0) - { - newSeq.append(sequence.substring(0, start)); - } + int i, iSize = dbrefs.length; - char nextChar; - for(int c=start; c=e) + if (annotation == null) return null; - return getSubSequence(start, getLength()); - } - public int removeGaps() { - if (sequence!=null) - return removeGaps(0, getLength()); - return 0; + AlignmentAnnotation[] ret = new AlignmentAnnotation[annotation.size()]; + for (int r = 0; r < ret.length; r++) + ret[r] = (AlignmentAnnotation) annotation.elementAt(r); + + return ret; } - public int removeGaps(int start, int end) { - int jSize = getLength(); - int oSize=jSize; - if (jSize<=start) - return 0; - if (end>jSize) - end = jSize; + public void addAlignmentAnnotation(AlignmentAnnotation annotation) + { + if (this.annotation == null) + this.annotation = new Vector(); + + this.annotation.addElement(annotation); + } - // Removing a range is much quicker than removing gaps - // one by one for long sequences - int j = start; - int rangeStart=-1, rangeEnd=-1; - do - { - if (jalview.util.Comparison.isGap(getCharAt(j))) - { - if(rangeStart==-1) - { - rangeStart = j; - rangeEnd = j+1; - } - else - { - rangeEnd++; - } - j++; - } - else - { - if(rangeStart>-1) - { - deleteChars(rangeStart, rangeEnd); - j-=rangeEnd-rangeStart; - jSize-=rangeEnd-rangeStart; - rangeStart = -1; - rangeEnd = -1; - } - else - j++; + /** + * test if this is a valid candidate for another + * sequence's dataset sequence. + * + */ + private boolean isValidDatasetSequence() { + if (datasetSequence!=null) + return false; + for (int i=0;i-1) - { - deleteChars(rangeStart, rangeEnd); - jSize-=rangeEnd-rangeStart; - } - return oSize-jSize; // number of deleted characters. + return seq; } } + +