X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequence.java;h=cad59c879ee37dd899b15115cd914ec0754c1f38;hb=3cc8435c948994a2d7f7c4a3c34fede99df7e9af;hp=0225c883f3866620c01864a5b2e9311f8d870873;hpb=1201b837a0431d6a28943972d494a8c4ff36eb34;p=jalview.git diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java index 0225c88..cad59c8 100755 --- a/src/jalview/datamodel/Sequence.java +++ b/src/jalview/datamodel/Sequence.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer -* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle +* 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 @@ -31,691 +31,664 @@ 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; + SequenceI datasetSequence; + String name; + private String 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; + + /** 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(); + parseId(); - checkValidRange(); - } + 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; + char ch; + 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))) { - ch = sequence.charAt(j); - if (!jalview.util.Comparison.isGap( (ch))) - { - endRes++; - } + endRes++; } - if (endRes > 0) - { - endRes += start - 1; - } - - 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()); - } + /** + * 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) + /** + * DOCUMENT ME! + * + * @param v DOCUMENT ME! + */ + public void setSequenceFeatures(SequenceFeature[] features) + { + sequenceFeatures = features; + } + + public synchronized void addSequenceFeature(SequenceFeature sf) + { + if (sequenceFeatures == null) { - sequenceFeatures = features; + sequenceFeatures = new SequenceFeature[0]; } - public synchronized void addSequenceFeature(SequenceFeature sf) + for (int i = 0; i < sequenceFeatures.length; i++) { - if(sequenceFeatures==null) - { - sequenceFeatures = new SequenceFeature[0]; - } - - for(int i=0; i= sequence.length()) - { - return ""; - } + /** + * DOCUMENT ME! + * + * @param start DOCUMENT ME! + */ + public void setStart(int start) + { + this.start = start; + } - if (end >= sequence.length()) - { - end = sequence.length(); - } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int getStart() + { + return this.start; + } - 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! + * + * @param end DOCUMENT ME! + */ + public void setEnd(int end) + { + this.end = end; + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int getEnd() + { + return this.end; + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public int getLength() + { + return this.sequence.length(); + } + + /** + * DOCUMENT ME! + * + * @param seq DOCUMENT ME! + */ + public void setSequence(String seq) + { + this.sequence = seq; + checkValidRange(); + } + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getSequence() + { + return this.sequence; + } + + /** + * DOCUMENT ME! + * + * @param start DOCUMENT ME! + * @param end DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getSequence(int start, int end) + { + // JBPNote - left to user to pad the result here (TODO:Decide on this policy) + if (start >= sequence.length()) { - if (i < sequence.length()) - { - return sequence.charAt(i); - } - else - { - return ' '; - } + return ""; } - /** - * DOCUMENT ME! - * - * @param desc DOCUMENT ME! - */ - public void setDescription(String desc) + if (end >= sequence.length()) { - this.description = desc; + end = sequence.length(); } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public String getDescription() + 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.setDescription(description); + nseq.setDatasetSequence(getDatasetSequence()); + return nseq; + } + + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public char getCharAt(int i) + { + if (i < sequence.length()) { - return this.description; + return sequence.charAt(i); } - - /** - * DOCUMENT ME! - * - * @param pos DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public int findIndex(int pos) + else { - // returns the alignment position for a residue - int j = start; - int i = 0; + return ' '; + } + } - while ((i < sequence.length()) && (j <= end) && (j <= pos)) - { - if (!jalview.util.Comparison.isGap(sequence.charAt(i))) - { - j++; - } + /** + * DOCUMENT ME! + * + * @param desc DOCUMENT ME! + */ + public void setDescription(String desc) + { + this.description = desc; + } - i++; - } + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public String getDescription() + { + return this.description; + } - if ((j == end) && (j < pos)) - { - return end + 1; - } - else - { - return i; - } - } + /** + * 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; - /** - * 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) + while ( (i < sequence.length()) && (j <= end) && (j <= pos)) { - int j = 0; - int pos = start; - int seqlen=sequence.length(); - while ((j < i) && (j < seqlen)) - { - if (!jalview.util.Comparison.isGap((sequence.charAt(j)))) - { - pos++; - } - - j++; - } + if (!jalview.util.Comparison.isGap(sequence.charAt(i))) + { + j++; + } - return pos; + i++; } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public int[] gapMap() + if ( (j == end) && (j < pos)) { - // 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; - } - - j++; - } - - return map; + return end + 1; } - - /** - * DOCUMENT ME! - * - * @param i DOCUMENT ME! - */ - public void deleteCharAt(int i) + else { - if (i >= sequence.length()) - { - return; - } - - sequence = sequence.substring(0, i) + sequence.substring(i + 1); + return i; } + } - /** - * DOCUMENT ME! - * - * @param i DOCUMENT ME! - * @param j DOCUMENT ME! - */ - public void deleteChars(int i, int j) + /** + * 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 (i >= sequence.length()) - { - return; - } + if (!jalview.util.Comparison.isGap( (sequence.charAt(j)))) + { + pos++; + } - if (j >= sequence.length()) - { - sequence = sequence.substring(0, i); - } - else - { - sequence = sequence.substring(0, i) + sequence.substring(j); - } + j++; } + return pos; + } - /** - * 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()]; + /** + * 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, sequence); + int[] map = new int[seq.length()]; + int j = 0; + int p = 0; - for (int j = 0, k = ch.length; j < k; j++) - ch[j] = c; + while (j < sequence.length()) + { + if (!jalview.util.Comparison.isGap(sequence.charAt(j))) + { + map[p++] = j; + } - sequence = tmp + String.valueOf(ch); - } + j++; } - /** - * DOCUMENT ME! - * - * @param c DOCUMENT ME! - */ - public void setColor(Color c) - { - this.color = c; - } + return map; + } - /** - * DOCUMENT ME! - * - * @return DOCUMENT ME! - */ - public Color getColor() + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + */ + public void deleteCharAt(int i) + { + if (i >= sequence.length()) { - return color; + return; } - public String getVamsasId() - { - return vamsasId; - } + sequence = sequence.substring(0, i) + sequence.substring(i + 1); + } - public void setVamsasId(String id) + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * @param j DOCUMENT ME! + */ + public void deleteChars(int i, int j) + { + if (i >= sequence.length()) { - vamsasId = id; + return; } - public void setDBRef(DBRefEntry [] dbref) + if (j >= sequence.length()) { - dbrefs = dbref; + sequence = sequence.substring(0, i); } - - public DBRefEntry [] getDBRef() + else { - return dbrefs; + sequence = sequence.substring(0, i) + sequence.substring(j); } + } - public void addDBRef(DBRefEntry entry) - { - if(dbrefs == null) - dbrefs = new DBRefEntry[0]; - - DBRefEntry [] temp = new DBRefEntry[dbrefs.length+1]; - System.arraycopy(dbrefs, 0, temp, 0, dbrefs.length); - - temp[temp.length-1] = entry; - - dbrefs = temp; - } + /** + * DOCUMENT ME! + * + * @param i DOCUMENT ME! + * @param c DOCUMENT ME! + * @param chop DOCUMENT ME! + */ + public void insertCharAt(int i, int length, char c) + { + StringBuffer tmp; - public void setDatasetSequence(SequenceI seq) + if (i >= sequence.length()) { - datasetSequence = seq; + tmp = new StringBuffer(sequence); } + else + tmp = new StringBuffer(sequence.substring(0, i)); - public SequenceI getDatasetSequence() + while (length > 0) { - return datasetSequence; + tmp.append(c); + length--; } - public AlignmentAnnotation [] getAnnotation() + if (i < sequence.length()) { - if(annotation==null) - return null; - - AlignmentAnnotation [] ret = new AlignmentAnnotation[annotation.size()]; - for(int r = 0; rsequence.length()) - end = sequence.length(); + public void addDBRef(DBRefEntry entry) + { + if (dbrefs == null) + dbrefs = new DBRefEntry[0]; + + int i, iSize = dbrefs.length; - if (start > 0) + for(i=0; isequence.length()) - end = sequence.length(); + public AlignmentAnnotation[] getAnnotation() + { + if (annotation == null) + return null; - if (start > 0) - { - newSeq.append(sequence.substring(0, start)); - } + AlignmentAnnotation[] ret = new AlignmentAnnotation[annotation.size()]; + for (int r = 0; r < ret.length; r++) + ret[r] = (AlignmentAnnotation) annotation.elementAt(r); - char nextChar; - for(int c=start; c=e) - return null; - return getSubSequence(start, getLength()); + hiddenSequences.deleteSequence(seq, false); + if (hiddenSequences.getSize(false) < 1) + { + hiddenSequences = null; + } } - } + +