X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FSequenceIdMatcher.java;h=56b760a59da440099c38598ea4856019db640400;hb=50ae21686bb576ce02f2a83a1d53744b86290479;hp=1efe4982810ecb2a79b57a85834178374108926a;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git diff --git a/src/jalview/analysis/SequenceIdMatcher.java b/src/jalview/analysis/SequenceIdMatcher.java index 1efe498..56b760a 100755 --- a/src/jalview/analysis/SequenceIdMatcher.java +++ b/src/jalview/analysis/SequenceIdMatcher.java @@ -1,163 +1,272 @@ -/* - * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 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 - */ -package jalview.analysis; - -import java.util.*; - -import jalview.datamodel.*; - -/** - *
Title:
- * SequenceIdMatcher - *Description:
- * Routine which does approximate Sequence Id resolution by name using string containment rather than equivalence - *Copyright: Copyright (c) 2004
- * - *Company: Dundee University
- * - * @author not attributable - * @version 1.0 - */ -public class SequenceIdMatcher -{ - private Hashtable names; - - public SequenceIdMatcher(SequenceI[] seqs) - { - names = new Hashtable(); - - for (int i = 0; i < seqs.length; i++) - { - names.put(new SeqIdName(seqs[i].getName()), seqs[i]); - } - } - - SequenceI findIdMatch(SequenceI seq) - { - SeqIdName nam = new SeqIdName(seq.getName()); - - if (names.containsKey(nam)) - { - return (SequenceI) names.get(nam); - } - - return null; - } - - SequenceI findIdMatch(String seqnam) - { - SeqIdName nam = new SeqIdName(seqnam); - - if (names.containsKey(nam)) - { - return (SequenceI) names.get(nam); - } - - return null; - } - - /** - * findIdMatch - * - * Return pointers to sequences (or sequence object containers) - * which have same Id as a given set of different sequence objects - * - * @param seqs SequenceI[] - * @return SequenceI[] - */ - SequenceI[] findIdMatch(SequenceI[] seqs) - { - SequenceI[] namedseqs = new SequenceI[seqs.length]; - - int i = 0; - SeqIdName nam; - - if (seqs.length > 0) - { - do - { - nam = new SeqIdName(seqs[i].getName()); - - if (names.containsKey(nam)) - { - namedseqs[i] = (SequenceI) names.get(nam); - } - else - { - namedseqs[i] = null; - } - } - while (i++ < seqs.length); - } - - return namedseqs; - } - - private class SeqIdName - { - String id; - - SeqIdName(String s) - { - id = new String(s); - } - - public int hashCode() - { - return (id.substring(0, 4).hashCode()); - } - - public boolean equals(Object s) - { - if (s instanceof SeqIdName) - { - return this.equals( (SeqIdName) s); - } - else - { - if (s instanceof String) - { - return this.equals( (String) s); - } - } - - return false; - } - - public boolean equals(SeqIdName s) - { - if (id.startsWith(s.id) || s.id.startsWith(id)) - { - return true; - } - - return false; - } - - public boolean equals(String s) - { - if (id.startsWith(s) || s.startsWith(id)) - { - return true; - } - - return false; - } - } -} +/* + * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) + * Copyright (C) 2009 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 + */ +package jalview.analysis; + +import java.util.*; + +import jalview.datamodel.*; + +/** + *+ * Title: + *
+ * SequenceIdMatcher + *+ * Description: + *
+ * Routine which does approximate Sequence Id resolution by name using string + * containment (on word boundaries) rather than equivalence. It also attempts to + * resolve ties where no exact match is available by picking the the id closest + * to the query. + *+ * Copyright: Copyright (c) 2004 + *
+ * + *+ * Company: Dundee University + *
+ * + * @author not attributable + * @version 1.0 + */ +public class SequenceIdMatcher +{ + private Hashtable names; + + public SequenceIdMatcher(SequenceI[] seqs) + { + names = new Hashtable(); + for (int i = 0; i < seqs.length; i++) + { + names.put(new SeqIdName(seqs[i].getName()), seqs[i]); + // add in any interesting identifiers + if (seqs[i].getDBRef()!=null) + { + DBRefEntry dbr[] = seqs[i].getDBRef(); + SeqIdName sid=null; + for (int r=0;r