X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=83aab4e22e56df58b420f9171a00a0a9d0bcd407;hb=9a729c9cc5344884e81a05b6f2d54c35d1104722;hp=f9de1156ee4d9e6ec0aea5fb99009c7d137858c6;hpb=d6509fcf3a8cc90616e18cb22cec97f85c722bb8;p=jalview.git diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java index f9de115..83aab4e 100755 --- a/src/jalview/datamodel/Alignment.java +++ b/src/jalview/datamodel/Alignment.java @@ -1,13 +1,13 @@ /* - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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 @@ -19,8 +19,6 @@ package jalview.datamodel; import java.util.*; -import jalview.analysis.*; - /** * Data structure to hold and manipulate a multiple sequence alignment */ @@ -44,7 +42,7 @@ public class Alignment implements AlignmentI public static final int PROTEIN = 0; public static final int NUCLEOTIDE = 1; - + public boolean hasRNAStructure = false; /** DOCUMENT ME!! */ @@ -125,14 +123,17 @@ public class Alignment implements AlignmentI { 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. + // 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) @@ -151,6 +152,7 @@ public class Alignment implements AlignmentI * * @return DOCUMENT ME! */ + @Override public SequenceI getSequenceAt(int i) { synchronized (sequences) @@ -168,6 +170,7 @@ public class Alignment implements AlignmentI * * @param snew */ + @Override public void addSequence(SequenceI snew) { if (dataset != null) @@ -206,6 +209,7 @@ public class Alignment implements AlignmentI * * @param snew */ + @Override public void setSequenceAt(int i, SequenceI snew) { SequenceI oldseq = getSequenceAt(i); @@ -221,11 +225,13 @@ public class Alignment implements AlignmentI * * @return DOCUMENT ME! */ - public Vector getGroups() + @Override + public List getGroups() { return groups; } + @Override public void finalize() { if (getDataset() != null) @@ -256,6 +262,7 @@ public class Alignment implements AlignmentI * @param s * DOCUMENT ME! */ + @Override public void deleteSequence(SequenceI s) { deleteSequence(findIndex(s)); @@ -267,6 +274,7 @@ public class Alignment implements AlignmentI * @param i * DOCUMENT ME! */ + @Override public void deleteSequence(int i) { if (i > -1 && i < getHeight()) @@ -281,7 +289,7 @@ public class Alignment implements AlignmentI /* * (non-Javadoc) - * + * * @see jalview.datamodel.AlignmentI#findGroup(jalview.datamodel.SequenceI) */ @Override @@ -302,14 +310,13 @@ public class Alignment implements AlignmentI return null; } - /** - * DOCUMENT ME! - * - * @param s - * DOCUMENT ME! + /* + * (non-Javadoc) * - * @return DOCUMENT ME! + * @see + * jalview.datamodel.AlignmentI#findAllGroups(jalview.datamodel.SequenceI) */ + @Override public SequenceGroup[] findAllGroups(SequenceI s) { ArrayList temp = new ArrayList(); @@ -338,6 +345,7 @@ public class Alignment implements AlignmentI } /** */ + @Override public void addGroup(SequenceGroup sg) { synchronized (groups) @@ -428,6 +436,7 @@ public class Alignment implements AlignmentI } } + @Override public void deleteAllGroups() { synchronized (groups) @@ -441,6 +450,7 @@ public class Alignment implements AlignmentI } /** */ + @Override public void deleteGroup(SequenceGroup g) { synchronized (groups) @@ -454,6 +464,7 @@ public class Alignment implements AlignmentI } /** */ + @Override public SequenceI findName(String name) { return findName(name, false); @@ -464,6 +475,7 @@ public class Alignment implements AlignmentI * * @see jalview.datamodel.AlignmentI#findName(java.lang.String, boolean) */ + @Override public SequenceI findName(String token, boolean b) { return findName(null, token, b); @@ -475,6 +487,7 @@ public class Alignment implements AlignmentI * @see jalview.datamodel.AlignmentI#findName(SequenceI, java.lang.String, * boolean) */ + @Override public SequenceI findName(SequenceI startAfter, String token, boolean b) { @@ -515,6 +528,7 @@ public class Alignment implements AlignmentI return null; } + @Override public SequenceI[] findSequenceMatch(String name) { Vector matches = new Vector(); @@ -544,6 +558,7 @@ public class Alignment implements AlignmentI * * @see jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SequenceI) */ + @Override public int findIndex(SequenceI s) { int i = 0; @@ -567,6 +582,7 @@ public class Alignment implements AlignmentI * @see * jalview.datamodel.AlignmentI#findIndex(jalview.datamodel.SearchResults) */ + @Override public int findIndex(SearchResults results) { int i = 0; @@ -587,6 +603,7 @@ public class Alignment implements AlignmentI * * @return DOCUMENT ME! */ + @Override public int getHeight() { return sequences.size(); @@ -597,6 +614,7 @@ public class Alignment implements AlignmentI * * @return DOCUMENT ME! */ + @Override public int getWidth() { int maxLength = -1; @@ -618,6 +636,7 @@ public class Alignment implements AlignmentI * @param gc * DOCUMENT ME! */ + @Override public void setGapCharacter(char gc) { gapCharacter = gc; @@ -636,6 +655,7 @@ public class Alignment implements AlignmentI * * @return DOCUMENT ME! */ + @Override public char getGapCharacter() { return gapCharacter; @@ -646,6 +666,7 @@ public class Alignment implements AlignmentI * * @see jalview.datamodel.AlignmentI#isAligned() */ + @Override public boolean isAligned() { return isAligned(false); @@ -656,6 +677,7 @@ public class Alignment implements AlignmentI * * @see jalview.datamodel.AlignmentI#isAligned(boolean) */ + @Override public boolean isAligned(boolean includeHidden) { int width = getWidth(); @@ -683,11 +705,13 @@ public class Alignment implements AlignmentI * @seejalview.datamodel.AlignmentI#deleteAnnotation(jalview.datamodel. * AlignmentAnnotation) */ + @Override public boolean deleteAnnotation(AlignmentAnnotation aa) { return deleteAnnotation(aa, true); } - + + @Override public boolean deleteAnnotation(AlignmentAnnotation aa, boolean unhook) { int aSize = 1; @@ -721,7 +745,8 @@ public class Alignment implements AlignmentI if (swap) { annotations = temp; - if (unhook) { + if (unhook) + { unhookAnnotation(aa); } } @@ -752,6 +777,7 @@ public class Alignment implements AlignmentI * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel. * AlignmentAnnotation) */ + @Override public void addAnnotation(AlignmentAnnotation aa) { addAnnotation(aa, -1); @@ -763,12 +789,14 @@ public class Alignment implements AlignmentI * @seejalview.datamodel.AlignmentI#addAnnotation(jalview.datamodel. * AlignmentAnnotation, int) */ + @Override public void addAnnotation(AlignmentAnnotation aa, int pos) { - if(aa.getRNAStruc()!= null){ - hasRNAStructure=true; + if (aa.getRNAStruc() != null) + { + hasRNAStructure = true; } - + int aSize = 1; if (annotations != null) { @@ -804,6 +832,7 @@ public class Alignment implements AlignmentI annotations = temp; } + @Override public void setAnnotationIndex(AlignmentAnnotation aa, int index) { if (aa == null || annotations == null || annotations.length - 1 < index) @@ -845,6 +874,7 @@ public class Alignment implements AlignmentI return annotations; } + @Override public void setNucleotide(boolean b) { if (b) @@ -857,6 +887,7 @@ public class Alignment implements AlignmentI } } + @Override public boolean isNucleotide() { if (type == NUCLEOTIDE) @@ -868,12 +899,15 @@ public class Alignment implements AlignmentI return false; } } - - public boolean hasRNAStructure(){ - //TODO can it happen that structure is removed from 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) @@ -888,7 +922,7 @@ public class Alignment implements AlignmentI currentSeq = getSequenceAt(i); if (currentSeq.getDatasetSequence() != null) { - seqs[i] = (Sequence) currentSeq.getDatasetSequence(); + seqs[i] = currentSeq.getDatasetSequence(); } else { @@ -918,11 +952,13 @@ public class Alignment implements AlignmentI alignmentRefs++; } + @Override public Alignment getDataset() { return dataset; } + @Override public boolean padGaps() { boolean modified = false; @@ -974,6 +1010,7 @@ public class Alignment implements AlignmentI * 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; @@ -1071,11 +1108,13 @@ public class Alignment implements AlignmentI return modified; } + @Override public HiddenSequences getHiddenSequences() { return hiddenSequences; } + @Override public CigarArray getCompactAlignment() { synchronized (sequences) @@ -1101,6 +1140,7 @@ public class Alignment implements AlignmentI alignmentProperties.put(key, value); } + @Override public Object getProperty(Object key) { if (alignmentProperties != null) @@ -1109,6 +1149,7 @@ public class Alignment implements AlignmentI return null; } + @Override public Hashtable getProperties() { return alignmentProperties; @@ -1123,6 +1164,7 @@ public class Alignment implements AlignmentI * jalview.datamodel.AlignmentI#addCodonFrame(jalview.datamodel.AlignedCodonFrame * ) */ + @Override public void addCodonFrame(AlignedCodonFrame codons) { if (codons == null) @@ -1144,6 +1186,7 @@ public class Alignment implements AlignmentI * * @see jalview.datamodel.AlignmentI#getCodonFrame(int) */ + @Override public AlignedCodonFrame getCodonFrame(int index) { return codonFrameList[index]; @@ -1155,6 +1198,7 @@ public class Alignment implements AlignmentI * @see * jalview.datamodel.AlignmentI#getCodonFrame(jalview.datamodel.SequenceI) */ + @Override public AlignedCodonFrame[] getCodonFrame(SequenceI seq) { if (seq == null || codonFrameList == null) @@ -1177,6 +1221,7 @@ public class Alignment implements AlignmentI * * @see jalview.datamodel.AlignmentI#getCodonFrames() */ + @Override public AlignedCodonFrame[] getCodonFrames() { return codonFrameList; @@ -1188,6 +1233,7 @@ public class Alignment implements AlignmentI * @seejalview.datamodel.AlignmentI#removeCodonFrame(jalview.datamodel. * AlignedCodonFrame) */ + @Override public boolean removeCodonFrame(AlignedCodonFrame codons) { if (codons == null || codonFrameList == null) @@ -1214,6 +1260,7 @@ public class Alignment implements AlignmentI return removed; } + @Override public void append(AlignmentI toappend) { if (toappend == this) @@ -1263,7 +1310,7 @@ public class Alignment implements AlignmentI List sg = toappend.getGroups(); if (sg != null) { - for (SequenceGroup _sg:sg) + for (SequenceGroup _sg : sg) { addGroup(_sg); } @@ -1333,14 +1380,15 @@ public class Alignment implements AlignmentI } @Override - public AlignmentAnnotation findOrCreateAnnotation(String name, boolean autoCalc, - SequenceI seqRef, SequenceGroup groupRef) + public AlignmentAnnotation findOrCreateAnnotation(String name, + String calcId, boolean autoCalc, SequenceI seqRef, + SequenceGroup groupRef) { - for (AlignmentAnnotation annot : - getAlignmentAnnotation()) + assert (name != null); + for (AlignmentAnnotation annot : getAlignmentAnnotation()) { - if (annot.autoCalculated == autoCalc - && annot.getCalcId().equals(name) + if (annot.autoCalculated == autoCalc && (name.equals(annot.label)) + && (calcId == null || annot.getCalcId().equals(calcId)) && annot.sequenceRef == seqRef && annot.groupRef == groupRef) { return annot; @@ -1349,7 +1397,7 @@ public class Alignment implements AlignmentI AlignmentAnnotation annot = new AlignmentAnnotation(name, name, new Annotation[1], 0f, 0f, AlignmentAnnotation.BAR_GRAPH); annot.hasText = false; - annot.setCalcId(new String(name)); + annot.setCalcId(new String(calcId)); annot.autoCalculated = autoCalc; if (seqRef != null) { @@ -1364,10 +1412,12 @@ public class Alignment implements AlignmentI @Override public Iterable findAnnotation(String calcId) { - ArrayList aa=new ArrayList(); - for (AlignmentAnnotation a:getAlignmentAnnotation()) + ArrayList aa = new ArrayList(); + for (AlignmentAnnotation a : getAlignmentAnnotation()) { - if (a.getCalcId()==calcId || (a.getCalcId()!=null && calcId!=null && a.getCalcId().equals(calcId))) + if (a.getCalcId() == calcId + || (a.getCalcId() != null && calcId != null && a.getCalcId() + .equals(calcId))) { aa.add(a); } @@ -1375,4 +1425,55 @@ public class Alignment implements AlignmentI 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); + } + } + + } + } + }