X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=7f035b4b3234092abfcd507feb04a47872e7a64a;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=b5f31bccc0ee0e5d3904f568d8b75c986d4eef47;hpb=4d2e0d36506302cc00677527725bcccbdf27d766;p=jalview.git
diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index b5f31bc..7f035b4 100755
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -1,705 +1,1515 @@
/*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.datamodel;
-import jalview.analysis.*;
-
-import jalview.util.*;
-
import java.util.*;
-/** Data structure to hold and manipulate a multiple sequence alignment
+/**
+ * Data structure to hold and manipulate a multiple sequence alignment
+ */
+/**
+ * @author JimP
+ *
*/
public class Alignment implements AlignmentI
{
- protected Alignment dataset;
- protected Vector sequences;
- protected Vector groups = new Vector();
- protected char gapCharacter = '-';
- protected int type = NUCLEOTIDE;
- public static final int PROTEIN = 0;
- public static final int NUCLEOTIDE = 1;
+ protected Alignment dataset;
- /** DOCUMENT ME!! */
- public AlignmentAnnotation[] annotations;
+ protected List sequences;
- HiddenSequences hiddenSequences = new HiddenSequences(this);
+ protected List groups = java.util.Collections
+ .synchronizedList(new ArrayList());
- private void initAlignment(SequenceI[] seqs) {
- int i=0;
+ protected char gapCharacter = '-';
- if( jalview.util.Comparison.isNucleotide(seqs))
- type = NUCLEOTIDE;
- else
- type = PROTEIN;
+ protected int type = NUCLEOTIDE;
+
+ public static final int PROTEIN = 0;
+
+ public static final int NUCLEOTIDE = 1;
+
+ public boolean hasRNAStructure = false;
+
+ /** DOCUMENT ME!! */
+ public AlignmentAnnotation[] annotations;
- sequences = new Vector();
+ HiddenSequences hiddenSequences = new HiddenSequences(this);
+
+ public Hashtable alignmentProperties;
+
+ private void initAlignment(SequenceI[] seqs)
+ {
+ int i = 0;
+
+ if (jalview.util.Comparison.isNucleotide(seqs))
+ {
+ type = NUCLEOTIDE;
+ }
+ else
+ {
+ type = PROTEIN;
+ }
+
+ sequences = java.util.Collections
+ .synchronizedList(new ArrayList());
+
+ for (i = 0; i < seqs.length; i++)
+ {
+ sequences.add(seqs[i]);
+ }
+
+ }
+
+ /**
+ * Make an alignment from an array of Sequences.
+ *
+ * @param sequences
+ */
+ public Alignment(SequenceI[] seqs)
+ {
+ initAlignment(seqs);
+ }
+
+ /**
+ * Make a new alignment from an array of SeqCigars
+ *
+ * @param seqs
+ * SeqCigar[]
+ */
+ public Alignment(SeqCigar[] alseqs)
+ {
+ SequenceI[] seqs = SeqCigar.createAlignmentSequences(alseqs,
+ gapCharacter, new ColumnSelection(), null);
+ initAlignment(seqs);
+ }
+
+ /**
+ * Make a new alignment from an CigarArray JBPNote - can only do this when
+ * compactAlignment does not contain hidden regions. JBPNote - must also check
+ * that compactAlignment resolves to a set of SeqCigars - or construct them
+ * appropriately.
+ *
+ * @param compactAlignment
+ * CigarArray
+ */
+ public static AlignmentI createAlignment(CigarArray compactAlignment)
+ {
+ throw new Error("Alignment(CigarArray) not yet implemented");
+ // this(compactAlignment.refCigars);
+ }
- for (i = 0; i < seqs.length; i++)
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ @Override
+ public List getSequences()
+ {
+ return sequences;
+ }
+
+ @Override
+ public List getSequences(
+ Map hiddenReps)
+ {
+ // TODO: in jalview 2.8 we don't do anything with hiddenreps - fix design to
+ // work on this.
+ return sequences;
+ }
+
+ @Override
+ public SequenceI[] getSequencesArray()
+ {
+ if (sequences == null)
+ return null;
+ synchronized (sequences)
+ {
+ return sequences.toArray(new SequenceI[sequences.size()]);
+ }
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param i
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ @Override
+ public SequenceI getSequenceAt(int i)
+ {
+ synchronized (sequences)
+ {
+ if (i > -1 && i < sequences.size())
{
- sequences.addElement(seqs[i]);
+ return sequences.get(i);
}
+ }
+ return null;
+ }
+ /**
+ * Adds a sequence to the alignment. Recalculates maxLength and size.
+ *
+ * @param snew
+ */
+ @Override
+ public void addSequence(SequenceI snew)
+ {
+ if (dataset != null)
+ {
+ // maintain dataset integrity
+ if (snew.getDatasetSequence() != null)
+ {
+ getDataset().addSequence(snew.getDatasetSequence());
+ }
+ else
+ {
+ // derive new sequence
+ SequenceI adding = snew.deriveSequence();
+ getDataset().addSequence(adding.getDatasetSequence());
+ snew = adding;
+ }
}
- /** Make an alignment from an array of Sequences.
- *
- * @param sequences
- */
- public Alignment(SequenceI[] seqs)
+ if (sequences == null)
{
- initAlignment(seqs);
+ initAlignment(new SequenceI[]
+ { snew });
}
- /**
- * Make a new alignment from an array of SeqCigars
- * @param seqs SeqCigar[]
- */
- public Alignment(SeqCigar[] alseqs) {
- SequenceI[] seqs = SeqCigar.createAlignmentSequences(alseqs, gapCharacter, new ColumnSelection(), null);
- initAlignment(seqs);
+ else
+ {
+ synchronized (sequences)
+ {
+ sequences.add(snew);
+ }
}
- /**
- * Make a new alignment from an CigarArray
- * JBPNote - can only do this when compactAlignment does not contain hidden regions.
- * JBPNote - must also check that compactAlignment resolves to a set of SeqCigars - or construct them appropriately.
- * @param compactAlignment CigarArray
- */
- public static AlignmentI createAlignment(CigarArray compactAlignment) {
- throw new Error("Alignment(CigarArray) not yet implemented");
- // this(compactAlignment.refCigars);
+ if (hiddenSequences != null)
+ hiddenSequences.adjustHeightSequenceAdded();
+ }
+
+ /**
+ * Adds a sequence to the alignment. Recalculates maxLength and size.
+ *
+ * @param snew
+ */
+ @Override
+ public void setSequenceAt(int i, SequenceI snew)
+ {
+ SequenceI oldseq = getSequenceAt(i);
+ deleteSequence(i);
+ synchronized (sequences)
+ {
+ sequences.set(i, snew);
}
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ @Override
+ public List getGroups()
+ {
+ return groups;
+ }
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Vector getSequences()
+ @Override
+ public void finalize()
+ {
+ if (getDataset() != null)
+ getDataset().removeAlignmentRef();
+
+ dataset = null;
+ sequences = null;
+ groups = null;
+ annotations = null;
+ hiddenSequences = null;
+ }
+
+ /**
+ * decrement the alignmentRefs counter by one and call finalize if it goes to
+ * zero.
+ */
+ private void removeAlignmentRef()
+ {
+ if (--alignmentRefs == 0)
{
- return sequences;
+ finalize();
}
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param s
+ * DOCUMENT ME!
+ */
+ @Override
+ public void deleteSequence(SequenceI s)
+ {
+ deleteSequence(findIndex(s));
+ }
- public SequenceI [] getSequencesArray()
+ /**
+ * DOCUMENT ME!
+ *
+ * @param i
+ * DOCUMENT ME!
+ */
+ @Override
+ public void deleteSequence(int i)
+ {
+ if (i > -1 && i < getHeight())
{
- SequenceI [] reply = new SequenceI[sequences.size()];
- for(int i=0; i temp = new ArrayList();
+
+ synchronized (groups)
{
- if(dataset!=null)
+ int gSize = groups.size();
+ for (int i = 0; i < gSize; i++)
{
- if(snew.getDatasetSequence()!=null)
+ SequenceGroup sg = groups.get(i);
+ if (sg == null || sg.getSequences(null) == null)
{
- getDataset().addSequence(snew.getDatasetSequence());
+ this.deleteGroup(sg);
+ gSize--;
+ continue;
}
- else
+
+ if (sg.getSequences(null).contains(s))
{
- Sequence ds = new Sequence(snew.getName(),
- AlignSeq.extractGaps("-. ",
- snew.getSequenceAsString()),
- snew.getStart(),
- snew.getEnd());
-
- snew.setDatasetSequence(ds);
- getDataset().addSequence(ds);
+ temp.add(sg);
}
}
- sequences.addElement(snew);
-
- hiddenSequences.adjustHeightSequenceAdded();
}
+ SequenceGroup[] ret = new SequenceGroup[temp.size()];
+ return temp.toArray(ret);
+ }
-
- /** Adds a sequence to the alignment. Recalculates maxLength and size.
- *
- * @param snew
- */
- public void setSequenceAt(int i, SequenceI snew)
+ /** */
+ @Override
+ public void addGroup(SequenceGroup sg)
+ {
+ synchronized (groups)
{
- SequenceI oldseq = getSequenceAt(i);
- deleteSequence(oldseq);
+ if (!groups.contains(sg))
+ {
+ if (hiddenSequences.getSize() > 0)
+ {
+ int i, iSize = sg.getSize();
+ for (i = 0; i < iSize; i++)
+ {
+ if (!sequences.contains(sg.getSequenceAt(i)))
+ {
+ sg.deleteSequence(sg.getSequenceAt(i), false);
+ iSize--;
+ i--;
+ }
+ }
- sequences.setElementAt(snew, i);
+ if (sg.getSize() < 1)
+ {
+ return;
+ }
+ }
+ sg.setContext(this);
+ groups.add(sg);
+ }
}
+ }
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public Vector getGroups()
+ /**
+ * remove any annotation that references gp
+ *
+ * @param gp
+ * (if null, removes all group associated annotation)
+ */
+ private void removeAnnotationForGroup(SequenceGroup gp)
+ {
+ if (annotations == null || annotations.length == 0)
+ {
+ return;
+ }
+ // remove annotation very quickly
+ AlignmentAnnotation[] t, todelete = new AlignmentAnnotation[annotations.length], tokeep = new AlignmentAnnotation[annotations.length];
+ int i, p, k;
+ if (gp == null)
+ {
+ for (i = 0, p = 0, k = 0; i < annotations.length; i++)
+ {
+ if (annotations[i].groupRef != null)
+ {
+ todelete[p++] = annotations[i];
+ }
+ else
+ {
+ tokeep[k++] = annotations[i];
+ }
+ }
+ }
+ else
+ {
+ for (i = 0, p = 0, k = 0; i < annotations.length; i++)
+ {
+ if (annotations[i].groupRef == gp)
+ {
+ todelete[p++] = annotations[i];
+ }
+ else
+ {
+ tokeep[k++] = annotations[i];
+ }
+ }
+ }
+ if (p > 0)
{
- return groups;
+ // clear out the group associated annotation.
+ for (i = 0; i < p; i++)
+ {
+ unhookAnnotation(todelete[i]);
+ todelete[i] = null;
+ }
+ t = new AlignmentAnnotation[k];
+ for (i = 0; i < k; i++)
+ {
+ t[i] = tokeep[i];
+ }
+ annotations = t;
}
+ }
- /**
- * DOCUMENT ME!
- *
- * @param s DOCUMENT ME!
- */
- public void deleteSequence(SequenceI s)
+ @Override
+ public void deleteAllGroups()
+ {
+ synchronized (groups)
{
- deleteSequence(findIndex(s));
+ if (annotations != null)
+ {
+ removeAnnotationForGroup(null);
+ }
+ for (SequenceGroup sg:groups) {
+ sg.setContext(null);
+ }
+ groups.clear();
}
+ }
- /**
- * DOCUMENT ME!
- *
- * @param i DOCUMENT ME!
- */
- public void deleteSequence(int i)
+ /** */
+ @Override
+ public void deleteGroup(SequenceGroup g)
+ {
+ synchronized (groups)
{
- if(i>-1 && i0)
- {
- //We're not going to make groups of
- //Hidden sequences
- int i, iSize = sg.getSize(false);
- for (i = 0; i < iSize; i++)
- {
- if (!sequences.contains(sg.getSequenceAt(i)))
- {
- sg.deleteSequence(sg.getSequenceAt(i), false);
- iSize--;
- i--;
- }
- }
+ if (results.involvesSequence(getSequenceAt(i)))
+ {
+ return i;
+ }
+ i++;
+ }
+ return -1;
+ }
- if (sg.getSize(true) < 1)
- return;
- }
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ @Override
+ public int getHeight()
+ {
+ return sequences.size();
+ }
- groups.addElement(sg);
- }
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ @Override
+ public int getWidth()
+ {
+ int maxLength = -1;
+
+ for (int i = 0; i < sequences.size(); i++)
+ {
+ if (getSequenceAt(i).getLength() > maxLength)
+ {
+ maxLength = getSequenceAt(i).getLength();
+ }
}
- /**
- * DOCUMENT ME!
- */
- public void deleteAllGroups()
+ return maxLength;
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @param gc
+ * DOCUMENT ME!
+ */
+ @Override
+ public void setGapCharacter(char gc)
+ {
+ gapCharacter = gc;
+ synchronized (sequences)
{
- groups.removeAllElements();
+ for (SequenceI seq : sequences)
+ {
+ seq.setSequence(seq.getSequenceAsString().replace('.', gc)
+ .replace('-', gc).replace(' ', gc));
+ }
}
+ }
+
+ /**
+ * DOCUMENT ME!
+ *
+ * @return DOCUMENT ME!
+ */
+ @Override
+ public char getGapCharacter()
+ {
+ return gapCharacter;
+ }
- /** */
- public void deleteGroup(SequenceGroup g)
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#isAligned()
+ */
+ @Override
+ public boolean isAligned()
+ {
+ return isAligned(false);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#isAligned(boolean)
+ */
+ @Override
+ public boolean isAligned(boolean includeHidden)
+ {
+ int width = getWidth();
+ if (hiddenSequences == null || hiddenSequences.getSize() == 0)
{
- if (groups.contains(g))
+ includeHidden = true; // no hidden sequences to check against.
+ }
+ for (int i = 0; i < sequences.size(); i++)
+ {
+ if (includeHidden || !hiddenSequences.isHidden(getSequenceAt(i)))
+ {
+ if (getSequenceAt(i).getLength() != width)
{
- groups.removeElement(g);
+ return false;
}
+ }
}
- /** */
- public SequenceI findName(String name)
- {
- int i = 0;
+ return true;
+ }
- while (i < sequences.size())
- {
- if (getSequenceAt(i).getName().equals(name))
- {
- return getSequenceAt(i);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @seejalview.datamodel.AlignmentI#deleteAnnotation(jalview.datamodel.
+ * AlignmentAnnotation)
+ */
+ @Override
+ public boolean deleteAnnotation(AlignmentAnnotation aa)
+ {
+ return deleteAnnotation(aa, true);
+ }
- i++;
- }
+ @Override
+ public boolean deleteAnnotation(AlignmentAnnotation aa, boolean unhook)
+ {
+ int aSize = 1;
- return null;
+ if (annotations != null)
+ {
+ aSize = annotations.length;
}
- public SequenceI [] findSequenceMatch(String name)
+ if (aSize < 1)
{
- Vector matches = new Vector();
- int i = 0;
-
- while (i < sequences.size())
- {
- if (getSequenceAt(i).getName().equals(name))
- {
- matches.addElement(getSequenceAt(i));
- }
- i++;
- }
+ return false;
+ }
- SequenceI [] result = new SequenceI[matches.size()];
- for(i=0; i= aSize)
{
- int maxLength = -1;
-
- for (int i = 0; i < sequences.size(); i++)
+ temp[aSize - 1] = aa;
+ }
+ else
+ {
+ temp[pos] = aa;
+ }
+ if (aSize > 1)
+ {
+ int p = 0;
+ for (i = 0; i < (aSize - 1); i++, p++)
+ {
+ if (p == pos)
{
- if (getSequenceAt(i).getLength() > maxLength)
- {
- maxLength = getSequenceAt(i).getLength();
- }
+ p++;
+ }
+ if (p < temp.length)
+ {
+ temp[p] = annotations[i];
}
+ }
+ }
- return maxLength;
+ annotations = temp;
+ }
+
+ @Override
+ public void setAnnotationIndex(AlignmentAnnotation aa, int index)
+ {
+ if (aa == null || annotations == null || annotations.length - 1 < index)
+ {
+ return;
}
+ int aSize = annotations.length;
+ AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
+
+ temp[index] = aa;
- /**
- * DOCUMENT ME!
- *
- * @param gc DOCUMENT ME!
- */
- public void setGapCharacter(char gc)
+ for (int i = 0; i < aSize; i++)
{
- gapCharacter = gc;
+ if (i == index)
+ {
+ continue;
+ }
- for (int i = 0; i < sequences.size(); i++)
- {
- Sequence seq = (Sequence) sequences.elementAt(i);
- seq.setSequence( seq.getSequenceAsString().replace('.', gc) );
- seq.setSequence( seq.getSequenceAsString().replace('-', gc) );
- seq.setSequence( seq.getSequenceAsString().replace(' ', gc) );
- }
+ if (i < index)
+ {
+ temp[i] = annotations[i];
+ }
+ else
+ {
+ temp[i] = annotations[i - 1];
+ }
}
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public char getGapCharacter()
+ annotations = temp;
+ }
+
+ @Override
+ /**
+ * returns all annotation on the alignment
+ */
+ public AlignmentAnnotation[] getAlignmentAnnotation()
+ {
+ return annotations;
+ }
+
+ @Override
+ public void setNucleotide(boolean b)
+ {
+ if (b)
{
- return gapCharacter;
+ type = NUCLEOTIDE;
}
+ else
+ {
+ type = PROTEIN;
+ }
+ }
-
- /**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
- */
- public boolean isAligned()
+ @Override
+ public boolean isNucleotide()
+ {
+ if (type == NUCLEOTIDE)
+ {
+ return true;
+ }
+ else
{
- int width = getWidth();
+ return false;
+ }
+ }
- for (int i = 0; i < sequences.size(); i++)
+ @Override
+ public boolean hasRNAStructure()
+ {
+ // TODO can it happen that structure is removed from alignment?
+ return hasRNAStructure;
+ }
+
+ @Override
+ public void setDataset(Alignment data)
+ {
+ if (dataset == null && data == null)
+ {
+ // Create a new dataset for this alignment.
+ // Can only be done once, if dataset is not null
+ // This will not be performed
+ SequenceI[] seqs = new SequenceI[getHeight()];
+ SequenceI currentSeq;
+ for (int i = 0; i < getHeight(); i++)
+ {
+ currentSeq = getSequenceAt(i);
+ if (currentSeq.getDatasetSequence() != null)
{
- if (getSequenceAt(i).getLength() != width)
- {
- return false;
- }
+ seqs[i] = currentSeq.getDatasetSequence();
+ }
+ else
+ {
+ seqs[i] = currentSeq.createDatasetSequence();
}
+ }
- return true;
+ dataset = new Alignment(seqs);
}
-
- /**
- * DOCUMENT ME!
- *
- * @param aa DOCUMENT ME!
- */
- public void deleteAnnotation(AlignmentAnnotation aa)
+ else if (dataset == null && data != null)
{
- int aSize = 1;
+ dataset = data;
+ }
+ dataset.addAlignmentRef();
+ }
- if (annotations != null)
- {
- aSize = annotations.length;
- }
+ /**
+ * reference count for number of alignments referencing this one.
+ */
+ int alignmentRefs = 0;
- if(aSize<1)
- return;
+ /**
+ * increase reference count to this alignment.
+ */
+ private void addAlignmentRef()
+ {
+ alignmentRefs++;
+ }
- AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize - 1];
+ @Override
+ public Alignment getDataset()
+ {
+ return dataset;
+ }
- int tIndex = 0;
+ @Override
+ public boolean padGaps()
+ {
+ boolean modified = false;
- for (int i = 0; i < aSize; i++)
- {
- if (annotations[i] == aa)
- {
- continue;
- }
+ // Remove excess gaps from the end of alignment
+ int maxLength = -1;
- temp[tIndex] = annotations[i];
- tIndex++;
+ SequenceI current;
+ for (int i = 0; i < sequences.size(); i++)
+ {
+ current = getSequenceAt(i);
+ for (int j = current.getLength(); j > maxLength; j--)
+ {
+ if (j > maxLength
+ && !jalview.util.Comparison.isGap(current.getCharAt(j)))
+ {
+ maxLength = j;
+ break;
}
+ }
+ }
+
+ maxLength++;
+
+ int cLength;
+ for (int i = 0; i < sequences.size(); i++)
+ {
+ current = getSequenceAt(i);
+ cLength = current.getLength();
- annotations = temp;
+ if (cLength < maxLength)
+ {
+ current.insertCharAt(cLength, maxLength - cLength, gapCharacter);
+ modified = true;
+ }
+ else if (current.getLength() > maxLength)
+ {
+ current.deleteChars(maxLength, current.getLength());
+ }
}
+ return modified;
+ }
+ /**
+ * Justify the sequences to the left or right by deleting and inserting gaps
+ * before the initial residue or after the terminal residue
+ *
+ * @param right
+ * true if alignment padded to right, false to justify to left
+ * @return true if alignment was changed
+ */
+ @Override
+ public boolean justify(boolean right)
+ {
+ boolean modified = false;
- public void adjustSequenceAnnotations()
+ // Remove excess gaps from the end of alignment
+ int maxLength = -1;
+ int ends[] = new int[sequences.size() * 2];
+ SequenceI current;
+ for (int i = 0; i < sequences.size(); i++)
{
- if(annotations!=null)
+ current = getSequenceAt(i);
+ // This should really be a sequence method
+ ends[i * 2] = current.findIndex(current.getStart());
+ ends[i * 2 + 1] = current.findIndex(current.getStart()
+ + current.getLength());
+ boolean hitres = false;
+ for (int j = 0, rs = 0, ssiz = current.getLength(); j < ssiz; j++)
{
- for (int a = 0; a < annotations.length; a++)
+ if (!jalview.util.Comparison.isGap(current.getCharAt(j)))
{
- if (annotations[a].sequenceRef != null)
+ if (!hitres)
{
- annotations[a].adjustForAlignment();
+ ends[i * 2] = j;
+ hitres = true;
+ }
+ else
+ {
+ ends[i * 2 + 1] = j;
+ if (j - ends[i * 2] > maxLength)
+ {
+ maxLength = j - ends[i * 2];
+ }
}
}
}
}
- /**
- * DOCUMENT ME!
- *
- * @param aa DOCUMENT ME!
- */
- public void addAnnotation(AlignmentAnnotation aa)
+ maxLength++;
+ // now edit the flanking gaps to justify to either left or right
+ int cLength, extent, diff;
+ for (int i = 0; i < sequences.size(); i++)
{
- int aSize = 1;
- if (annotations != null)
+ current = getSequenceAt(i);
+
+ cLength = 1 + ends[i * 2 + 1] - ends[i * 2];
+ diff = maxLength - cLength; // number of gaps to indent
+ extent = current.getLength();
+ if (right)
+ {
+ // right justify
+ if (extent > ends[i * 2 + 1])
{
- aSize = annotations.length + 1;
+ current.deleteChars(ends[i * 2 + 1] + 1, extent);
+ modified = true;
}
-
- AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
-
- temp[aSize-1] = aa;
-
- int i = 0;
-
- if (aSize > 1)
+ if (ends[i * 2] > diff)
{
- for (i = 0; i < (aSize-1); i++)
- {
- temp[i] = annotations[i];
- }
+ current.deleteChars(0, ends[i * 2] - diff);
+ modified = true;
}
-
- annotations = temp;
+ else
+ {
+ if (ends[i * 2] < diff)
+ {
+ current.insertCharAt(0, diff - ends[i * 2], gapCharacter);
+ modified = true;
+ }
+ }
+ }
+ else
+ {
+ // left justify
+ if (ends[i * 2] > 0)
+ {
+ current.deleteChars(0, ends[i * 2]);
+ modified = true;
+ ends[i * 2 + 1] -= ends[i * 2];
+ extent -= ends[i * 2];
+ }
+ if (extent > maxLength)
+ {
+ current.deleteChars(maxLength + 1, extent);
+ modified = true;
+ }
+ else
+ {
+ if (extent < maxLength)
+ {
+ current.insertCharAt(extent, maxLength - extent, gapCharacter);
+ modified = true;
+ }
+ }
+ }
}
+ return modified;
+ }
+
+ @Override
+ public HiddenSequences getHiddenSequences()
+ {
+ return hiddenSequences;
+ }
- public void setAnnotationIndex(AlignmentAnnotation aa, int index)
+ @Override
+ public CigarArray getCompactAlignment()
+ {
+ synchronized (sequences)
{
- if(aa==null || annotations==null || annotations.length-1 sqs = (hashidden) ? toappend.getHiddenSequences()
+ .getFullAlignment().getSequences() : toappend.getSequences();
+ if (sqs != null)
{
- if(dataset==null && data==null)
+ synchronized (sqs)
{
- // Create a new dataset for this alignment.
- // Can only be done once, if dataset is not null
- // This will not be performed
- Sequence[] seqs = new Sequence[getHeight()];
- SequenceI currentSeq;
- for (int i = 0; i < getHeight(); i++)
+ for (SequenceI addedsq : sqs)
{
- currentSeq = getSequenceAt(i);
- if(currentSeq.getDatasetSequence()!=null)
- {
- seqs[i] = (Sequence)currentSeq.getDatasetSequence();
- }
- else
+ if (!samegap)
{
- seqs[i] = new Sequence(currentSeq.getName(),
- AlignSeq.extractGaps(
- jalview.util.Comparison.GapChars,
- currentSeq.getSequenceAsString()
- ),
- currentSeq.getStart(),
- currentSeq.getEnd());
- seqs[i].sequenceFeatures = currentSeq.getSequenceFeatures();
- seqs[i].setDescription(currentSeq.getDescription());
- getSequenceAt(i).setSequenceFeatures(null);
- getSequenceAt(i).setDatasetSequence(seqs[i]);
+ char[] oldseq = addedsq.getSequence();
+ for (int c = 0; c < oldseq.length; c++)
+ {
+ if (oldseq[c] == oldc)
+ {
+ oldseq[c] = gapCharacter;
+ }
+ }
}
+ addSequence(addedsq);
}
-
- dataset = new Alignment(seqs);
- }
- else if(dataset==null && data!=null)
- {
- dataset = data;
}
}
-
- public Alignment getDataset()
+ AlignmentAnnotation[] alan = toappend.getAlignmentAnnotation();
+ for (int a = 0; alan != null && a < alan.length; a++)
{
- return dataset;
+ addAnnotation(alan[a]);
}
-
- public boolean padGaps()
+ AlignedCodonFrame[] acod = toappend.getCodonFrames();
+ for (int a = 0; acod != null && a < acod.length; a++)
{
- boolean modified=false;
-
- //Remove excess gaps from the end of alignment
- int maxLength = -1;
-
- SequenceI current;
- for (int i = 0; i < sequences.size(); i++)
+ this.addCodonFrame(acod[a]);
+ }
+ List sg = toappend.getGroups();
+ if (sg != null)
+ {
+ for (SequenceGroup _sg : sg)
+ {
+ addGroup(_sg);
+ }
+ }
+ if (toappend.getHiddenSequences() != null)
+ {
+ HiddenSequences hs = toappend.getHiddenSequences();
+ if (hiddenSequences == null)
+ {
+ hiddenSequences = new HiddenSequences(this);
+ }
+ if (hs.hiddenSequences != null)
{
- current = getSequenceAt(i);
- for (int j = current.getLength(); j > maxLength; j--)
+ for (int s = 0; s < hs.hiddenSequences.length; s++)
{
- if (j > maxLength && !jalview.util.Comparison.isGap(
- current.getCharAt(j)))
+ // hide the newly appended sequence in the alignment
+ if (hs.hiddenSequences[s] != null)
{
- maxLength = j;
- break;
+ hiddenSequences.hideSequence(hs.hiddenSequences[s]);
}
}
}
-
- maxLength++;
-
- int cLength;
- for (int i = 0; i < sequences.size();
- i++)
+ }
+ if (toappend.getProperties() != null)
+ {
+ // we really can't do very much here - just try to concatenate strings
+ // where property collisions occur.
+ Enumeration key = toappend.getProperties().keys();
+ while (key.hasMoreElements())
{
- current = getSequenceAt(i);
- cLength = current.getLength();
-
- if (cLength < maxLength)
+ Object k = key.nextElement();
+ Object ourval = this.getProperty(k);
+ Object toapprop = toappend.getProperty(k);
+ if (ourval != null)
{
- current.insertCharAt(cLength,
- maxLength-cLength, gapCharacter);
- modified=true;
+ if (ourval.getClass().equals(toapprop.getClass())
+ && !ourval.equals(toapprop))
+ {
+ if (ourval instanceof String)
+ {
+ // append strings
+ this.setProperty(k, ((String) ourval) + "; "
+ + ((String) toapprop));
+ }
+ else
+ {
+ if (ourval instanceof Vector)
+ {
+ // append vectors
+ Enumeration theirv = ((Vector) toapprop).elements();
+ while (theirv.hasMoreElements())
+ {
+ ((Vector) ourval).addElement(theirv);
+ }
+ }
+ }
+ }
}
- else if(current.getLength() > maxLength)
+ else
{
- current.deleteChars(maxLength, current.getLength());
+ // just add new property directly
+ setProperty(k, toapprop);
}
+
}
- return modified;
}
+ }
- public HiddenSequences getHiddenSequences()
+ @Override
+ public AlignmentAnnotation findOrCreateAnnotation(String name,
+ String calcId, boolean autoCalc, SequenceI seqRef,
+ SequenceGroup groupRef)
+ {
+ assert (name != null);
+ if (annotations != null)
{
- return hiddenSequences;
+ for (AlignmentAnnotation annot : getAlignmentAnnotation())
+ {
+ if (annot.autoCalculated == autoCalc && (name.equals(annot.label))
+ && (calcId == null || annot.getCalcId().equals(calcId))
+ && annot.sequenceRef == seqRef
+ && annot.groupRef == groupRef)
+ {
+ return annot;
+ }
+ }
}
- SequenceI [] getVisibleAndRepresentedSeqs()
+ AlignmentAnnotation annot = new AlignmentAnnotation(name, name,
+ new Annotation[1], 0f, 0f, AlignmentAnnotation.BAR_GRAPH);
+ annot.hasText = false;
+ annot.setCalcId(new String(calcId));
+ annot.autoCalculated = autoCalc;
+ if (seqRef != null)
{
- if(hiddenSequences==null || hiddenSequences.getSize()<1)
- return getSequencesArray();
+ annot.setSequenceRef(seqRef);
+ }
+ annot.groupRef = groupRef;
+ addAnnotation(annot);
- Vector seqs = new Vector();
- SequenceI seq;
- SequenceGroup hidden;
- for (int i = 0; i < sequences.size(); i++)
+ return annot;
+ }
+
+ @Override
+ public Iterable findAnnotation(String calcId)
+ {
+ ArrayList aa = new ArrayList();
+ for (AlignmentAnnotation a : getAlignmentAnnotation())
+ {
+ if (a.getCalcId() == calcId
+ || (a.getCalcId() != null && calcId != null && a.getCalcId()
+ .equals(calcId)))
{
- seq = (SequenceI) sequences.elementAt(i);
- seqs.addElement(seq);
- hidden = seq.getHiddenSequences();
- if(hidden!=null)
+ aa.add(a);
+ }
+ }
+ return aa;
+ }
+
+ @Override
+ public void moveSelectedSequencesByOne(SequenceGroup sg,
+ Map map, boolean up)
+ {
+ synchronized (sequences)
+ {
+ if (up)
+ {
+
+ for (int i = 1, iSize = sequences.size(); i < iSize; i++)
{
- for(int j=0; j -1; i--)
+ {
+ SequenceI seq = sequences.get(i);
+ if (!sg.getSequences(map).contains(seq))
+ {
+ continue;
+ }
- return result;
+ SequenceI temp = sequences.get(i + 1);
+ if (sg.getSequences(map).contains(temp))
+ {
+ continue;
+ }
- }
+ sequences.set(i, temp);
+ sequences.set(i + 1, seq);
+ }
+ }
- public CigarArray getCompactAlignment()
- {
- SeqCigar alseqs[] = new SeqCigar[sequences.size()];
- for (int i=0; i