protected Alignment dataset;\r
protected Vector sequences;\r
protected Vector groups = new Vector();\r
- protected Vector superGroup = new Vector();\r
protected char gapCharacter = '-';\r
protected int type = NUCLEOTIDE;\r
public static final int PROTEIN = 0;\r
for (i = 0; i < seqs.length; i++)\r
{\r
sequences.addElement(seqs[i]);\r
-\r
- if(seqs[i].getDatasetSequence()!=null\r
- && seqs[i].getDatasetSequence().getAnnotation()!=null)\r
- {\r
-\r
- for(int a=0; a<seqs[i].getDatasetSequence().getAnnotation().length; a++)\r
- {\r
- this.addAnnotation(seqs[i].getDatasetSequence().getAnnotation()[a], seqs[i]);\r
- }\r
- }\r
}\r
-\r
- getWidth();\r
}\r
\r
/**\r
return sequences;\r
}\r
\r
+ public SequenceI [] getSequencesArray()\r
+ {\r
+ SequenceI [] reply = new SequenceI[sequences.size()];\r
+ for(int i=0; i<sequences.size(); i++)\r
+ {\r
+ reply[i] = (SequenceI)sequences.elementAt(i);\r
+ }\r
+ return reply;\r
+ }\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
*/\r
public void addSequence(SequenceI snew)\r
{\r
- sequences.addElement(snew);\r
- }\r
-\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param seq DOCUMENT ME!\r
- */\r
- public void addSequence(SequenceI[] seq)\r
- {\r
- for (int i = 0; i < seq.length; i++)\r
+ if(dataset!=null)\r
+ {\r
+ if(snew.getDatasetSequence()!=null)\r
+ {\r
+ System.out.println(snew.getName());\r
+ getDataset().addSequence(snew.getDatasetSequence());\r
+ }\r
+ else\r
{\r
- addSequence(seq[i]);\r
+ Sequence ds = new Sequence(snew.getName(),\r
+ AlignSeq.extractGaps("-. ",\r
+ snew.getSequence()),\r
+ snew.getStart(),\r
+ snew.getEnd());\r
+\r
+ snew.setDatasetSequence(ds);\r
+ getDataset().addSequence(ds);\r
}\r
+ }\r
+\r
+ sequences.addElement(snew);\r
}\r
\r
+\r
/** Adds a sequence to the alignment. Recalculates maxLength and size.\r
*\r
* @param snew\r
*/\r
public void removeGaps()\r
{\r
+ SequenceI[] seqs = getVisibleAndRepresentedSeqs();\r
+ int j, jSize = seqs.length;\r
+\r
SequenceI current;\r
- int iSize = getWidth();\r
+ int width = 0;\r
+ for (int i = 0; i < jSize; i++)\r
+ {\r
+ if (seqs[i].getLength() > width)\r
+ {\r
+ width = seqs[i].getLength();\r
+ }\r
+ }\r
\r
- for (int i = 0; i < iSize; i++)\r
+ int startCol = -1, endCol = -1;\r
+ boolean delete = true;\r
+ for (int i = 0; i < width; i++)\r
{\r
- boolean delete = true;\r
+ delete = true;\r
\r
- for (int j = 0; j < getHeight(); j++)\r
+ for (j = 0; j < jSize; j++)\r
{\r
current = getSequenceAt(j);\r
\r
if (current.getLength() > i)\r
{\r
- /* MC Should move this to a method somewhere */\r
if (!jalview.util.Comparison.isGap(current.getCharAt(i)))\r
{\r
+ if(delete)\r
+ endCol = i;\r
+\r
delete = false;\r
+ break;\r
}\r
}\r
+\r
+ }\r
+\r
+ if(delete && startCol==-1)\r
+ {\r
+ startCol = i;\r
}\r
\r
- if (delete)\r
+\r
+ if (!delete && startCol > -1)\r
{\r
- deleteColumns(i, i);\r
- iSize--;\r
- i--;\r
+ deleteColumns(seqs, startCol, endCol);\r
+ width -= (endCol - startCol);\r
+ i -= (endCol - startCol);\r
+ startCol = -1;\r
+ endCol = -1;\r
}\r
}\r
+\r
+ if (delete && startCol > -1)\r
+ {\r
+ deleteColumns(seqs, startCol, endCol);\r
+ }\r
+\r
}\r
\r
/** Removes a range of columns (start to end inclusive).\r
*\r
+ * @param seqs Sequences to remove columns from\r
* @param start Start column in the alignment\r
* @param end End column in the alignment\r
*/\r
- public void deleteColumns(int start, int end)\r
+ public void deleteColumns(SequenceI [] seqs, int start, int end)\r
{\r
- deleteColumns(0, getHeight() - 1, start, end);\r
+ for(int i=0; i<seqs.length; i++)\r
+ seqs[i].deleteChars(start, end);\r
}\r
\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param seq1 DOCUMENT ME!\r
- * @param seq2 DOCUMENT ME!\r
- * @param start DOCUMENT ME!\r
- * @param end DOCUMENT ME!\r
- */\r
- public void deleteColumns(int seq1, int seq2, int start, int end)\r
- {\r
- for (int i = 0; i <= (end - start); i++)\r
- {\r
- for (int j = seq1; j <= seq2; j++)\r
- {\r
- getSequenceAt(j).deleteCharAt(start);\r
- }\r
- }\r
- }\r
\r
/**\r
* DOCUMENT ME!\r
*/\r
public void trimLeft(int i)\r
{\r
- int j, jSize = getHeight();\r
+ SequenceI[] seqs = getVisibleAndRepresentedSeqs();\r
+ int j, jSize = seqs.length;\r
for (j = 0; j < jSize; j++)\r
{\r
- SequenceI s = getSequenceAt(j);\r
- int newstart = s.findPosition(i);\r
+ int newstart = seqs[j].findPosition(i);\r
\r
- if(i>s.getLength())\r
+ if(i>seqs[j].getLength())\r
{\r
- sequences.removeElement(s);\r
+ sequences.removeElement(seqs[j]);\r
j--;\r
jSize--;\r
}\r
else\r
{\r
- s.setStart(newstart);\r
- s.setSequence(s.getSequence().substring(i));\r
+ seqs[j].setStart(newstart);\r
+ seqs[j].setSequence(seqs[j].getSequence().substring(i));\r
}\r
}\r
}\r
*/\r
public void trimRight(int i)\r
{\r
- for (int j = 0; j < getHeight(); j++)\r
+ SequenceI[] seqs = getVisibleAndRepresentedSeqs();\r
+ int j, jSize = seqs.length;\r
+ for (j = 0; j < jSize; j++)\r
{\r
- SequenceI s = getSequenceAt(j);\r
- int newend = s.findPosition(i);\r
+ int newend = seqs[j].findPosition(i);\r
\r
- s.setEnd(newend);\r
- if(s.getLength()>i)\r
- s.setSequence(s.getSequence().substring(0, i + 1));\r
+ seqs[j].setEnd(newend);\r
+ if(seqs[j].getLength()>i)\r
+ seqs[j].setSequence(seqs[j].getSequence().substring(0, i + 1));\r
}\r
}\r
\r
sequences.removeElementAt(i);\r
}\r
\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param threshold DOCUMENT ME!\r
- * @param sel DOCUMENT ME!\r
- *\r
- * @return DOCUMENT ME!\r
- */\r
- public Vector removeRedundancy(float threshold, Vector sel)\r
- {\r
- Vector del = new Vector();\r
-\r
- for (int i = 1; i < sel.size(); i++)\r
- {\r
- for (int j = 0; j < i; j++)\r
- {\r
- // Only do the comparison if either have not been deleted\r
- if (!del.contains((SequenceI) sel.elementAt(i)) ||\r
- !del.contains((SequenceI) sel.elementAt(j)))\r
- {\r
- // use PID instead of Comparison (which is really not pleasant)\r
- float pid = Comparison.PID((SequenceI) sel.elementAt(j),\r
- (SequenceI) sel.elementAt(i));\r
-\r
- if (pid >= threshold)\r
- {\r
- // Delete the shortest one\r
- if (((SequenceI) sel.elementAt(j)).getSequence().length() > ((SequenceI) sel\r
- .elementAt(\r
- i)).getSequence().length())\r
- {\r
- del.addElement(sel.elementAt(i));\r
- }\r
- else\r
- {\r
- del.addElement(sel.elementAt(i));\r
- }\r
- }\r
- }\r
- }\r
- }\r
-\r
- // Now delete the sequences\r
- for (int i = 0; i < del.size(); i++)\r
- {\r
- deleteSequence((SequenceI) del.elementAt(i));\r
- }\r
-\r
- return del;\r
- }\r
-\r
- /** */\r
- public SequenceGroup findGroup(int i)\r
- {\r
- return findGroup(getSequenceAt(i));\r
- }\r
\r
/** */\r
public SequenceGroup findGroup(SequenceI s)\r
{\r
SequenceGroup sg = (SequenceGroup) groups.elementAt(i);\r
\r
- if (sg.sequences.contains(s))\r
+ if (sg.getSequences(false).contains(s))\r
{\r
return sg;\r
}\r
for (int i = 0; i < gSize; i++)\r
{\r
SequenceGroup sg = (SequenceGroup) groups.elementAt(i);\r
- if(sg==null || sg.sequences==null)\r
+ if(sg==null || sg.getSequences(false)==null)\r
{\r
this.deleteGroup(sg);\r
gSize--;\r
continue;\r
}\r
\r
- if (sg.sequences.contains(s))\r
+ if (sg.getSequences(false).contains(s))\r
{\r
temp.addElement(sg);\r
}\r
public void deleteAllGroups()\r
{\r
groups.removeAllElements();\r
- superGroup.removeAllElements();\r
\r
int i = 0;\r
\r
for (int i = 0; i < sequences.size(); i++)\r
{\r
Sequence seq = (Sequence) sequences.elementAt(i);\r
- seq.sequence = seq.sequence.replace('.', gc);\r
- seq.sequence = seq.sequence.replace('-', gc);\r
- seq.sequence = seq.sequence.replace(' ', gc);\r
+ seq.setSequence( seq.getSequence().replace('.', gc) );\r
+ seq.setSequence( seq.getSequence().replace('-', gc) );\r
+ seq.setSequence( seq.getSequence().replace(' ', gc) );\r
}\r
}\r
\r
annotations = temp;\r
}\r
\r
- /**\r
- *\r
- * @param aa AlignmentAnnotation\r
- * @param seqRef The sequence to associate this annotation with\r
- * @return The adjusted AlignmentAnnotation, with dataset sequence and annotation added\r
- */\r
- public AlignmentAnnotation addAnnotation(AlignmentAnnotation aa, SequenceI seqRef)\r
- {\r
- if(seqRef!=null)\r
- {\r
- //We can only add Annotations to the dataset sequences\r
- if(seqRef.getDatasetSequence()==null)\r
- {\r
- setDataset(null);\r
- }\r
-\r
- AlignmentAnnotation [] old = seqRef.getDatasetSequence().getAnnotation();\r
-\r
- //First check if this is a new annotation or not. If it is new,\r
- //we must add the annotation to the dataset\r
- boolean newAnnotation = true;\r
- if(seqRef.getDatasetSequence().getAnnotation()!=null)\r
- {\r
- for(int a=0; a<old.length; a++)\r
- {\r
- if(old[a] == aa)\r
- {\r
-\r
- newAnnotation = false;\r
- break;\r
- }\r
- }\r
- }\r
-\r
- if(newAnnotation)\r
- {\r
- seqRef.getDatasetSequence().addAlignmentAnnotation(aa);\r
- }\r
-\r
- AlignmentAnnotation copy = null;\r
- if (aa.graph > 0)\r
- copy = new AlignmentAnnotation(\r
- aa.label, aa.description, aa.annotations, aa.graphMin,\r
- aa.graphMax, aa.graph\r
- );\r
- else\r
- copy = new AlignmentAnnotation(\r
- aa.label, aa.description, aa.annotations\r
- );\r
-\r
- copy.datasetAnnotation = aa;\r
-\r
- addAnnotation(copy);\r
-\r
- copy.sequenceRef = seqRef;\r
-\r
- return copy;\r
- }\r
- else\r
- {\r
- addAnnotation(aa);\r
- return aa;\r
- }\r
- }\r
\r
public void adjustSequenceAnnotations()\r
{\r
Sequence[] seqs = new Sequence[getHeight()];\r
for (int i = 0; i < getHeight(); i++)\r
{\r
-\r
- seqs[i] = new Sequence(getSequenceAt(i).getName(),\r
- AlignSeq.extractGaps(\r
- jalview.util.Comparison.GapChars,\r
- getSequenceAt(i).getSequence()\r
- ),\r
- getSequenceAt(i).getStart(),\r
- getSequenceAt(i).getEnd());\r
-\r
- getSequenceAt(i).setDatasetSequence(seqs[i]);\r
+ if(getSequenceAt(i).getDatasetSequence()!=null)\r
+ {\r
+ seqs[i] = (Sequence)getSequenceAt(i).getDatasetSequence();\r
+ }\r
+ else\r
+ {\r
+ seqs[i] = new Sequence(getSequenceAt(i).getName(),\r
+ AlignSeq.extractGaps(\r
+ jalview.util.Comparison.GapChars,\r
+ getSequenceAt(i).getSequence()\r
+ ),\r
+ getSequenceAt(i).getStart(),\r
+ getSequenceAt(i).getEnd());\r
+\r
+ getSequenceAt(i).setDatasetSequence(seqs[i]);\r
+ }\r
}\r
\r
dataset = new Alignment(seqs);\r
return hiddenSequences;\r
}\r
\r
+ SequenceI [] getVisibleAndRepresentedSeqs()\r
+ {\r
+ if(hiddenSequences==null || hiddenSequences.getSize()<1)\r
+ return getSequencesArray();\r
+\r
+ Vector seqs = new Vector();\r
+ SequenceI seq;\r
+ SequenceGroup hidden;\r
+ for (int i = 0; i < sequences.size(); i++)\r
+ {\r
+ seq = (SequenceI) sequences.elementAt(i);\r
+ seqs.addElement(seq);\r
+ hidden = seq.getHiddenSequences();\r
+ if(hidden!=null)\r
+ {\r
+ for(int j=0; j<hidden.getSize(false); j++)\r
+ {\r
+ seqs.addElement(hidden.getSequenceAt(j));\r
+ }\r
+ }\r
+ }\r
+ SequenceI [] result = new SequenceI[seqs.size()];\r
+ for(int i=0; i<seqs.size(); i++)\r
+ result[i] = (SequenceI)seqs.elementAt(i);\r
+\r
+ return result;\r
+\r
+ }\r
+\r
}\r
git://source.jalview.org / jalview.git / blobdiff