X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=6c119364fb62b9b77b531696e54f9a54e718960c;hb=e015538903c8cabb2b90dd030e3e0c419a730db9;hp=abaa80ffa48f40868d3d026503d00bab2b556d51;hpb=a0b666f6b2b220b28baf6022a41ecf3c50db7d0c;p=jalview.git
diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java
index abaa80f..6c11936 100755
--- a/src/jalview/datamodel/Alignment.java
+++ b/src/jalview/datamodel/Alignment.java
@@ -1,40 +1,50 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 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, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
- * This program is free software; you can redistribute it and/or
+ * 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 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3 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.
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
*/
package jalview.datamodel;
import java.util.*;
-import jalview.analysis.*;
-
-/** 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
+public class Alignment implements AlignmentI
{
protected Alignment dataset;
- protected Vector sequences;
- protected Vector groups = new Vector();
+
+ protected List sequences;
+
+ protected List groups = java.util.Collections
+ .synchronizedList(new ArrayList());
+
protected char gapCharacter = '-';
+
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;
@@ -55,16 +65,18 @@ public class Alignment
type = PROTEIN;
}
- sequences = new Vector();
+ sequences = java.util.Collections
+ .synchronizedList(new ArrayList());
for (i = 0; i < seqs.length; i++)
{
- sequences.addElement(seqs[i]);
+ sequences.add(seqs[i]);
}
}
- /** Make an alignment from an array of Sequences.
+ /**
+ * Make an alignment from an array of Sequences.
*
* @param sequences
*/
@@ -75,20 +87,25 @@ public class Alignment
/**
* Make a new alignment from an array of SeqCigars
- * @param seqs SeqCigar[]
+ *
+ * @param seqs
+ * SeqCigar[]
*/
public Alignment(SeqCigar[] alseqs)
{
- SequenceI[] seqs = SeqCigar.createAlignmentSequences(alseqs, gapCharacter,
- new ColumnSelection(), null);
+ 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
+ * 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)
{
@@ -101,42 +118,59 @@ public class Alignment
*
* @return DOCUMENT ME!
*/
- public Vector getSequences()
+ @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()
{
- SequenceI[] reply = new SequenceI[sequences.size()];
- for (int i = 0; i < sequences.size(); i++)
+ if (sequences == null)
+ return null;
+ synchronized (sequences)
{
- reply[i] = (SequenceI) sequences.elementAt(i);
+ return sequences.toArray(new SequenceI[sequences.size()]);
}
- return reply;
}
/**
* DOCUMENT ME!
*
- * @param i DOCUMENT ME!
+ * @param i
+ * DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
+ @Override
public SequenceI getSequenceAt(int i)
{
- if (i < sequences.size())
+ synchronized (sequences)
{
- return (SequenceI) sequences.elementAt(i);
+ if (i > -1 && i < sequences.size())
+ {
+ return sequences.get(i);
+ }
}
-
return null;
}
- /** Adds a sequence to the alignment. Recalculates maxLength and size.
+ /**
+ * Adds a sequence to the alignment. Recalculates maxLength and size.
*
* @param snew
*/
+ @Override
public void addSequence(SequenceI snew)
{
if (dataset != null)
@@ -154,25 +188,36 @@ public class Alignment
snew = adding;
}
}
- if (sequences==null) {
- initAlignment(new SequenceI[] { snew });
- } else {
- sequences.addElement(snew);
+ if (sequences == null)
+ {
+ initAlignment(new SequenceI[]
+ { snew });
+ }
+ else
+ {
+ synchronized (sequences)
+ {
+ sequences.add(snew);
+ }
}
- if (hiddenSequences!=null)
+ if (hiddenSequences != null)
hiddenSequences.adjustHeightSequenceAdded();
}
- /** Adds a sequence to the alignment. Recalculates maxLength and size.
+ /**
+ * 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(oldseq);
-
- sequences.setElementAt(snew, i);
+ deleteSequence(i);
+ synchronized (sequences)
+ {
+ sequences.set(i, snew);
+ }
}
/**
@@ -180,15 +225,17 @@ public class Alignment
*
* @return DOCUMENT ME!
*/
- public Vector getGroups()
+ @Override
+ public List getGroups()
{
return groups;
}
+ @Override
public void finalize()
{
- if(getDataset()!=null)
- getDataset().finalize();
+ if (getDataset() != null)
+ getDataset().removeAlignmentRef();
dataset = null;
sequences = null;
@@ -197,12 +244,25 @@ public class Alignment
hiddenSequences = null;
}
+ /**
+ * decrement the alignmentRefs counter by one and call finalize if it goes to
+ * zero.
+ */
+ private void removeAlignmentRef()
+ {
+ if (--alignmentRefs == 0)
+ {
+ finalize();
+ }
+ }
/**
* DOCUMENT ME!
*
- * @param s DOCUMENT ME!
+ * @param s
+ * DOCUMENT ME!
*/
+ @Override
public void deleteSequence(SequenceI s)
{
deleteSequence(findIndex(s));
@@ -211,124 +271,253 @@ public class Alignment
/**
* DOCUMENT ME!
*
- * @param i DOCUMENT ME!
+ * @param i
+ * DOCUMENT ME!
*/
+ @Override
public void deleteSequence(int i)
{
if (i > -1 && i < getHeight())
{
- sequences.removeElementAt(i);
+ synchronized (sequences)
+ {
+ sequences.remove(i);
+ }
hiddenSequences.adjustHeightSequenceDeleted(i);
}
}
- /** */
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#findGroup(jalview.datamodel.SequenceI)
+ */
+ @Override
public SequenceGroup findGroup(SequenceI s)
{
- for (int i = 0; i < this.groups.size(); i++)
+ synchronized (groups)
{
- SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
-
- if (sg.getSequences(null).contains(s))
+ for (int i = 0; i < this.groups.size(); i++)
{
- return sg;
+ SequenceGroup sg = groups.get(i);
+
+ if (sg.getSequences(null).contains(s))
+ {
+ return sg;
+ }
}
}
-
return null;
}
- /**
- * DOCUMENT ME!
+ /*
+ * (non-Javadoc)
*
- * @param s DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * @see
+ * jalview.datamodel.AlignmentI#findAllGroups(jalview.datamodel.SequenceI)
*/
+ @Override
public SequenceGroup[] findAllGroups(SequenceI s)
{
- Vector temp = new Vector();
+ ArrayList temp = new ArrayList();
- int gSize = groups.size();
- for (int i = 0; i < gSize; i++)
+ synchronized (groups)
{
- SequenceGroup sg = (SequenceGroup) groups.elementAt(i);
- if (sg == null || sg.getSequences(null) == null)
+ int gSize = groups.size();
+ for (int i = 0; i < gSize; i++)
{
- this.deleteGroup(sg);
- gSize--;
- continue;
- }
+ SequenceGroup sg = groups.get(i);
+ if (sg == null || sg.getSequences(null) == null)
+ {
+ this.deleteGroup(sg);
+ gSize--;
+ continue;
+ }
- if (sg.getSequences(null).contains(s))
- {
- temp.addElement(sg);
+ if (sg.getSequences(null).contains(s))
+ {
+ temp.add(sg);
+ }
}
}
-
SequenceGroup[] ret = new SequenceGroup[temp.size()];
-
- for (int i = 0; i < temp.size(); i++)
- {
- ret[i] = (SequenceGroup) temp.elementAt(i);
- }
-
- return ret;
+ return temp.toArray(ret);
}
/** */
+ @Override
public void addGroup(SequenceGroup sg)
{
- if (!groups.contains(sg))
+ synchronized (groups)
{
- if (hiddenSequences.getSize() > 0)
+ if (!groups.contains(sg))
{
- int i, iSize = sg.getSize();
- for (i = 0; i < iSize; i++)
+ if (hiddenSequences.getSize() > 0)
{
- if (!sequences.contains(sg.getSequenceAt(i)))
+ int i, iSize = sg.getSize();
+ for (i = 0; i < iSize; i++)
{
- sg.deleteSequence(sg.getSequenceAt(i), false);
- iSize--;
- i--;
+ if (!sequences.contains(sg.getSequenceAt(i)))
+ {
+ sg.deleteSequence(sg.getSequenceAt(i), false);
+ iSize--;
+ i--;
+ }
}
- }
- if (sg.getSize() < 1)
- {
- return;
+ if (sg.getSize() < 1)
+ {
+ return;
+ }
}
- }
- groups.addElement(sg);
+ groups.add(sg);
+ }
}
}
/**
- * DOCUMENT ME!
+ * 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)
+ {
+ // 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;
+ }
+ }
+
+ @Override
public void deleteAllGroups()
{
- groups.removeAllElements();
+ synchronized (groups)
+ {
+ if (annotations != null)
+ {
+ removeAnnotationForGroup(null);
+ }
+ groups.clear();
+ }
}
/** */
+ @Override
public void deleteGroup(SequenceGroup g)
{
- if (groups.contains(g))
+ synchronized (groups)
{
- groups.removeElement(g);
+ if (groups.contains(g))
+ {
+ removeAnnotationForGroup(g);
+ groups.remove(g);
+ }
}
}
/** */
+ @Override
public SequenceI findName(String name)
{
- int i = 0;
+ return findName(name, false);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#findName(java.lang.String, boolean)
+ */
+ @Override
+ public SequenceI findName(String token, boolean b)
+ {
+ return findName(null, token, b);
+ }
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#findName(SequenceI, java.lang.String,
+ * boolean)
+ */
+ @Override
+ public SequenceI findName(SequenceI startAfter, String token, boolean b)
+ {
+
+ int i = 0;
+ SequenceI sq = null;
+ String sqname = null;
+ if (startAfter != null)
+ {
+ // try to find the sequence in the alignment
+ boolean matched = false;
+ while (i < sequences.size())
+ {
+ if (getSequenceAt(i++) == startAfter)
+ {
+ matched = true;
+ break;
+ }
+ }
+ if (!matched)
+ {
+ i = 0;
+ }
+ }
while (i < sequences.size())
{
- if (getSequenceAt(i).getName().equals(name))
+ sq = getSequenceAt(i);
+ sqname = sq.getName();
+ if (sqname.equals(token) // exact match
+ || (b && // allow imperfect matches - case varies
+ (sqname.equalsIgnoreCase(token))))
{
return getSequenceAt(i);
}
@@ -339,6 +528,7 @@ public class Alignment
return null;
}
+ @Override
public SequenceI[] findSequenceMatch(String name)
{
Vector matches = new Vector();
@@ -363,7 +553,12 @@ public class Alignment
}
- /** */
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SequenceI)
+ */
+ @Override
public int findIndex(SequenceI s)
{
int i = 0;
@@ -381,11 +576,34 @@ public class Alignment
return -1;
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SearchResults)
+ */
+ @Override
+ public int findIndex(SearchResults results)
+ {
+ int i = 0;
+
+ while (i < sequences.size())
+ {
+ if (results.involvesSequence(getSequenceAt(i)))
+ {
+ return i;
+ }
+ i++;
+ }
+ return -1;
+ }
+
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
+ @Override
public int getHeight()
{
return sequences.size();
@@ -396,6 +614,7 @@ public class Alignment
*
* @return DOCUMENT ME!
*/
+ @Override
public int getWidth()
{
int maxLength = -1;
@@ -414,20 +633,20 @@ public class Alignment
/**
* DOCUMENT ME!
*
- * @param gc DOCUMENT ME!
+ * @param gc
+ * DOCUMENT ME!
*/
+ @Override
public void setGapCharacter(char gc)
{
gapCharacter = gc;
-
- for (int i = 0; i < sequences.size(); i++)
+ synchronized (sequences)
{
- Sequence seq = (Sequence) sequences.elementAt(i);
- seq.setSequence(seq.getSequenceAsString()
- .replace('.', gc)
- .replace('-', gc)
- .replace(' ', gc)
- );
+ for (SequenceI seq : sequences)
+ {
+ seq.setSequence(seq.getSequenceAsString().replace('.', gc)
+ .replace('-', gc).replace(' ', gc));
+ }
}
}
@@ -436,41 +655,65 @@ public class Alignment
*
* @return DOCUMENT ME!
*/
+ @Override
public char getGapCharacter()
{
return gapCharacter;
}
- /**
- * DOCUMENT ME!
+ /*
+ * (non-Javadoc)
*
- * @return DOCUMENT ME!
+ * @see jalview.datamodel.AlignmentI#isAligned()
*/
+ @Override
public boolean isAligned()
{
- int width = getWidth();
+ 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)
+ {
+ includeHidden = true; // no hidden sequences to check against.
+ }
for (int i = 0; i < sequences.size(); i++)
{
- if (getSequenceAt(i).getLength() != width)
+ if (includeHidden || !hiddenSequences.isHidden(getSequenceAt(i)))
{
- return false;
+ if (getSequenceAt(i).getLength() != width)
+ {
+ return false;
+ }
}
}
return true;
}
- /**
- * DOCUMENT ME!
+ /*
+ * (non-Javadoc)
*
- * @param aa DOCUMENT ME!
+ * @seejalview.datamodel.AlignmentI#deleteAnnotation(jalview.datamodel.
+ * AlignmentAnnotation)
*/
- public void deleteAnnotation(AlignmentAnnotation aa)
+ @Override
+ public boolean deleteAnnotation(AlignmentAnnotation aa)
{
- if(aa.sequenceRef!=null)
- aa.sequenceRef.removeAlignmentAnnotation(aa);
+ return deleteAnnotation(aa, true);
+ }
+ @Override
+ public boolean deleteAnnotation(AlignmentAnnotation aa, boolean unhook)
+ {
int aSize = 1;
if (annotations != null)
@@ -480,34 +723,80 @@ public class Alignment
if (aSize < 1)
{
- return;
+ return false;
}
AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize - 1];
+ boolean swap = false;
int tIndex = 0;
for (int i = 0; i < aSize; i++)
{
if (annotations[i] == aa)
{
+ swap = true;
continue;
}
-
- temp[tIndex] = annotations[i];
- tIndex++;
+ if (tIndex < temp.length)
+ temp[tIndex++] = annotations[i];
}
- annotations = temp;
+ if (swap)
+ {
+ annotations = temp;
+ if (unhook)
+ {
+ unhookAnnotation(aa);
+ }
+ }
+ return swap;
}
/**
- * DOCUMENT ME!
+ * remove any object references associated with this annotation
*
- * @param aa DOCUMENT ME!
+ * @param aa
*/
+ private void unhookAnnotation(AlignmentAnnotation aa)
+ {
+ if (aa.sequenceRef != null)
+ {
+ aa.sequenceRef.removeAlignmentAnnotation(aa);
+ }
+ if (aa.groupRef != null)
+ {
+ // probably need to do more here in the future (post 2.5.0)
+ aa.groupRef = null;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.
+ * AlignmentAnnotation)
+ */
+ @Override
public void addAnnotation(AlignmentAnnotation aa)
{
+ addAnnotation(aa, -1);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel.
+ * AlignmentAnnotation, int)
+ */
+ @Override
+ public void addAnnotation(AlignmentAnnotation aa, int pos)
+ {
+ if (aa.getRNAStruc() != null)
+ {
+ hasRNAStructure = true;
+ }
+
int aSize = 1;
if (annotations != null)
{
@@ -515,22 +804,35 @@ public class Alignment
}
AlignmentAnnotation[] temp = new AlignmentAnnotation[aSize];
-
- temp[aSize - 1] = aa;
-
int i = 0;
-
+ if (pos == -1 || pos >= aSize)
+ {
+ temp[aSize - 1] = aa;
+ }
+ else
+ {
+ temp[pos] = aa;
+ }
if (aSize > 1)
{
- for (i = 0; i < (aSize - 1); i++)
+ int p = 0;
+ for (i = 0; i < (aSize - 1); i++, p++)
{
- temp[i] = annotations[i];
+ if (p == pos)
+ {
+ p++;
+ }
+ if (p < temp.length)
+ {
+ temp[p] = annotations[i];
+ }
}
}
annotations = temp;
}
+ @Override
public void setAnnotationIndex(AlignmentAnnotation aa, int index)
{
if (aa == null || annotations == null || annotations.length - 1 < index)
@@ -563,16 +865,16 @@ public class Alignment
annotations = temp;
}
+ @Override
/**
- * DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * returns all annotation on the alignment
*/
public AlignmentAnnotation[] getAlignmentAnnotation()
{
return annotations;
}
+ @Override
public void setNucleotide(boolean b)
{
if (b)
@@ -585,6 +887,7 @@ public class Alignment
}
}
+ @Override
public boolean isNucleotide()
{
if (type == NUCLEOTIDE)
@@ -597,6 +900,14 @@ public class Alignment
}
}
+ @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)
@@ -604,28 +915,18 @@ public class Alignment
// 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[] seqs = new SequenceI[getHeight()];
SequenceI currentSeq;
for (int i = 0; i < getHeight(); i++)
{
currentSeq = getSequenceAt(i);
if (currentSeq.getDatasetSequence() != null)
{
- seqs[i] = (Sequence) currentSeq.getDatasetSequence();
+ seqs[i] = currentSeq.getDatasetSequence();
}
else
{
- 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]);
+ seqs[i] = currentSeq.createDatasetSequence();
}
}
@@ -635,18 +936,34 @@ public class Alignment
{
dataset = data;
}
+ dataset.addAlignmentRef();
+ }
+
+ /**
+ * reference count for number of alignments referencing this one.
+ */
+ int alignmentRefs = 0;
+
+ /**
+ * increase reference count to this alignment.
+ */
+ private void addAlignmentRef()
+ {
+ alignmentRefs++;
}
+ @Override
public Alignment getDataset()
{
return dataset;
}
+ @Override
public boolean padGaps()
{
boolean modified = false;
- //Remove excess gaps from the end of alignment
+ // Remove excess gaps from the end of alignment
int maxLength = -1;
SequenceI current;
@@ -655,8 +972,8 @@ public class Alignment
current = getSequenceAt(i);
for (int j = current.getLength(); j > maxLength; j--)
{
- if (j > maxLength && !jalview.util.Comparison.isGap(
- current.getCharAt(j)))
+ if (j > maxLength
+ && !jalview.util.Comparison.isGap(current.getCharAt(j)))
{
maxLength = j;
break;
@@ -667,16 +984,14 @@ public class Alignment
maxLength++;
int cLength;
- for (int i = 0; i < sequences.size();
- i++)
+ for (int i = 0; i < sequences.size(); i++)
{
current = getSequenceAt(i);
cLength = current.getLength();
if (cLength < maxLength)
{
- current.insertCharAt(cLength,
- maxLength - cLength, gapCharacter);
+ current.insertCharAt(cLength, maxLength - cLength, gapCharacter);
modified = true;
}
else if (current.getLength() > maxLength)
@@ -687,42 +1002,476 @@ public class Alignment
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;
+
+ // 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++)
+ {
+ 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++)
+ {
+ if (!jalview.util.Comparison.isGap(current.getCharAt(j)))
+ {
+ if (!hitres)
+ {
+ ends[i * 2] = j;
+ hitres = true;
+ }
+ else
+ {
+ ends[i * 2 + 1] = j;
+ if (j - ends[i * 2] > maxLength)
+ {
+ maxLength = j - ends[i * 2];
+ }
+ }
+ }
+ }
+ }
+
+ 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++)
+ {
+ 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])
+ {
+ current.deleteChars(ends[i * 2 + 1] + 1, extent);
+ modified = true;
+ }
+ if (ends[i * 2] > diff)
+ {
+ current.deleteChars(0, ends[i * 2] - diff);
+ modified = true;
+ }
+ 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;
}
+ @Override
public CigarArray getCompactAlignment()
{
- SeqCigar alseqs[] = new SeqCigar[sequences.size()];
- for (int i = 0; i < sequences.size(); i++)
+ synchronized (sequences)
{
- alseqs[i] = new SeqCigar( (SequenceI) sequences.elementAt(i));
+ SeqCigar alseqs[] = new SeqCigar[sequences.size()];
+ int i = 0;
+ for (SequenceI seq : sequences)
+ {
+ alseqs[i++] = new SeqCigar(seq);
+ }
+ CigarArray cal = new CigarArray(alseqs);
+ cal.addOperation(CigarArray.M, getWidth());
+ return cal;
}
- CigarArray cal = new CigarArray(alseqs);
- cal.addOperation(CigarArray.M, getWidth());
- return cal;
}
+ @Override
public void setProperty(Object key, Object value)
{
- if(alignmentProperties==null)
+ if (alignmentProperties == null)
alignmentProperties = new Hashtable();
- alignmentProperties.put(key,value);
+ alignmentProperties.put(key, value);
}
+ @Override
public Object getProperty(Object key)
{
- if(alignmentProperties!=null)
+ if (alignmentProperties != null)
return alignmentProperties.get(key);
else
return null;
}
+ @Override
public Hashtable getProperties()
{
return alignmentProperties;
}
+ AlignedCodonFrame[] codonFrameList = null;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.datamodel.AlignmentI#addCodonFrame(jalview.datamodel.AlignedCodonFrame
+ * )
+ */
+ @Override
+ public void addCodonFrame(AlignedCodonFrame codons)
+ {
+ if (codons == null)
+ return;
+ if (codonFrameList == null)
+ {
+ codonFrameList = new AlignedCodonFrame[]
+ { codons };
+ return;
+ }
+ AlignedCodonFrame[] t = new AlignedCodonFrame[codonFrameList.length + 1];
+ System.arraycopy(codonFrameList, 0, t, 0, codonFrameList.length);
+ t[codonFrameList.length] = codons;
+ codonFrameList = t;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#getCodonFrame(int)
+ */
+ @Override
+ public AlignedCodonFrame getCodonFrame(int index)
+ {
+ return codonFrameList[index];
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * jalview.datamodel.AlignmentI#getCodonFrame(jalview.datamodel.SequenceI)
+ */
+ @Override
+ public AlignedCodonFrame[] getCodonFrame(SequenceI seq)
+ {
+ if (seq == null || codonFrameList == null)
+ return null;
+ Vector cframes = new Vector();
+ for (int f = 0; f < codonFrameList.length; f++)
+ {
+ if (codonFrameList[f].involvesSequence(seq))
+ cframes.addElement(codonFrameList[f]);
+ }
+ if (cframes.size() == 0)
+ return null;
+ AlignedCodonFrame[] cfr = new AlignedCodonFrame[cframes.size()];
+ cframes.copyInto(cfr);
+ return cfr;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see jalview.datamodel.AlignmentI#getCodonFrames()
+ */
+ @Override
+ public AlignedCodonFrame[] getCodonFrames()
+ {
+ return codonFrameList;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @seejalview.datamodel.AlignmentI#removeCodonFrame(jalview.datamodel.
+ * AlignedCodonFrame)
+ */
+ @Override
+ public boolean removeCodonFrame(AlignedCodonFrame codons)
+ {
+ if (codons == null || codonFrameList == null)
+ return false;
+ boolean removed = false;
+ int i = 0, iSize = codonFrameList.length;
+ while (i < iSize)
+ {
+ if (codonFrameList[i] == codons)
+ {
+ removed = true;
+ if (i + 1 < iSize)
+ {
+ System.arraycopy(codonFrameList, i + 1, codonFrameList, i, iSize
+ - i - 1);
+ }
+ iSize--;
+ }
+ else
+ {
+ i++;
+ }
+ }
+ return removed;
+ }
+
+ @Override
+ public void append(AlignmentI toappend)
+ {
+ if (toappend == this)
+ {
+ System.err.println("Self append may cause a deadlock.");
+ }
+ // TODO test this method for a future 2.5 release
+ // currently tested for use in jalview.gui.SequenceFetcher
+ boolean samegap = toappend.getGapCharacter() == getGapCharacter();
+ char oldc = toappend.getGapCharacter();
+ boolean hashidden = toappend.getHiddenSequences() != null
+ && toappend.getHiddenSequences().hiddenSequences != null;
+ // get all sequences including any hidden ones
+ List sqs = (hashidden) ? toappend.getHiddenSequences()
+ .getFullAlignment().getSequences() : toappend.getSequences();
+ if (sqs != null)
+ {
+ synchronized (sqs)
+ {
+ for (SequenceI addedsq : sqs)
+ {
+ if (!samegap)
+ {
+ char[] oldseq = addedsq.getSequence();
+ for (int c = 0; c < oldseq.length; c++)
+ {
+ if (oldseq[c] == oldc)
+ {
+ oldseq[c] = gapCharacter;
+ }
+ }
+ }
+ addSequence(addedsq);
+ }
+ }
+ }
+ AlignmentAnnotation[] alan = toappend.getAlignmentAnnotation();
+ for (int a = 0; alan != null && a < alan.length; a++)
+ {
+ addAnnotation(alan[a]);
+ }
+ AlignedCodonFrame[] acod = toappend.getCodonFrames();
+ for (int a = 0; acod != null && a < acod.length; a++)
+ {
+ 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)
+ {
+ for (int s = 0; s < hs.hiddenSequences.length; s++)
+ {
+ // hide the newly appended sequence in the alignment
+ if (hs.hiddenSequences[s] != null)
+ {
+ hiddenSequences.hideSequence(hs.hiddenSequences[s]);
+ }
+ }
+ }
+ }
+ 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())
+ {
+ Object k = key.nextElement();
+ Object ourval = this.getProperty(k);
+ Object toapprop = toappend.getProperty(k);
+ if (ourval != null)
+ {
+ 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
+ {
+ // just add new property directly
+ setProperty(k, toapprop);
+ }
+
+ }
+ }
+ }
+
+ @Override
+ public AlignmentAnnotation findOrCreateAnnotation(String name,
+ boolean autoCalc, SequenceI seqRef, SequenceGroup groupRef)
+ {
+ for (AlignmentAnnotation annot : getAlignmentAnnotation())
+ {
+ if (annot.autoCalculated == autoCalc
+ && annot.getCalcId().equals(name)
+ && annot.sequenceRef == seqRef && annot.groupRef == groupRef)
+ {
+ return annot;
+ }
+ }
+ AlignmentAnnotation annot = new AlignmentAnnotation(name, name,
+ new Annotation[1], 0f, 0f, AlignmentAnnotation.BAR_GRAPH);
+ annot.hasText = false;
+ annot.setCalcId(new String(name));
+ annot.autoCalculated = autoCalc;
+ if (seqRef != null)
+ {
+ annot.setSequenceRef(seqRef);
+ }
+ annot.groupRef = groupRef;
+ addAnnotation(annot);
+
+ 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)))
+ {
+ 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++)
+ {
+ SequenceI seq = sequences.get(i);
+ if (!sg.getSequences(map).contains(seq))
+ {
+ continue;
+ }
+
+ SequenceI temp = sequences.get(i - 1);
+ if (sg.getSequences(null).contains(temp))
+ {
+ continue;
+ }
+
+ sequences.set(i, temp);
+ sequences.set(i - 1, seq);
+ }
+ }
+ else
+ {
+ for (int i = sequences.size() - 2; i > -1; i--)
+ {
+ SequenceI seq = sequences.get(i);
+ if (!sg.getSequences(map).contains(seq))
+ {
+ continue;
+ }
+
+ SequenceI temp = sequences.get(i + 1);
+ if (sg.getSequences(map).contains(temp))
+ {
+ continue;
+ }
+
+ sequences.set(i, temp);
+ sequences.set(i + 1, seq);
+ }
+ }
+
+ }
+ }
+
}