X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FNewickFile.java;h=800d51adf9d213bc4d6e929a18dd5313cadbfa19;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=372690983598af0aceb00f5ce0442d657883e102;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java index 3726909..800d51a 100755 --- a/src/jalview/io/NewickFile.java +++ b/src/jalview/io/NewickFile.java @@ -1,20 +1,22 @@ /* - * 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 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * - * 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 file is part of Jalview. * - * 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 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ // NewickFile.java // Tree I/O @@ -24,10 +26,14 @@ // TODO: Extended SequenceNodeI to hold parsed NHX strings package jalview.io; -import java.io.*; -import java.util.StringTokenizer; +import jalview.datamodel.SequenceNode; +import jalview.util.MessageManager; -import jalview.datamodel.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.StringTokenizer; /** * Parse a new hanpshire style tree Caveats: NHX files are NOT supported and the @@ -35,10 +41,10 @@ import jalview.datamodel.*; * this: NHX codes are appended in comments beginning with &&NHX. The codes are * given below (from http://www.phylosoft.org/forester/NHX.html): Element Type * Description Corresponding phyloXML element (parent element in parentheses) no - * tag string name of this node/clade (MUST BE FIRST, IF ASSIGNED) () : - * decimal branch length to parent node (MUST BE SECOND, IF ASSIGNED) - * () :GN= string gene name () :AC= - * string sequence accession () :ND= string node + * tag string name of this node/clade (MUST BE FIRST, IF ASSIGNED) + * () : decimal branch length to parent node (MUST BE SECOND, IF + * ASSIGNED) () :GN= string gene name () + * :AC= string sequence accession () :ND= string node * identifier - if this is being used, it has to be unique within each phylogeny * () :B= decimal confidence value for parent branch * () :D= 'T', 'F', or '?' 'T' if this node represents a @@ -97,10 +103,10 @@ public class NewickFile extends FileParse * Creates a new NewickFile object. * * @param inStr - * DOCUMENT ME! + * DOCUMENT ME! * * @throws IOException - * DOCUMENT ME! + * DOCUMENT ME! */ public NewickFile(String inStr) throws IOException { @@ -111,12 +117,12 @@ public class NewickFile extends FileParse * Creates a new NewickFile object. * * @param inFile - * DOCUMENT ME! + * DOCUMENT ME! * @param type - * DOCUMENT ME! + * DOCUMENT ME! * * @throws IOException - * DOCUMENT ME! + * DOCUMENT ME! */ public NewickFile(String inFile, String type) throws IOException { @@ -132,7 +138,7 @@ public class NewickFile extends FileParse * Creates a new NewickFile object. * * @param newtree - * DOCUMENT ME! + * DOCUMENT ME! */ public NewickFile(SequenceNode newtree) { @@ -143,9 +149,9 @@ public class NewickFile extends FileParse * Creates a new NewickFile object. * * @param newtree - * DOCUMENT ME! + * DOCUMENT ME! * @param bootstrap - * DOCUMENT ME! + * DOCUMENT ME! */ public NewickFile(SequenceNode newtree, boolean bootstrap) { @@ -157,11 +163,11 @@ public class NewickFile extends FileParse * Creates a new NewickFile object. * * @param newtree - * DOCUMENT ME! + * DOCUMENT ME! * @param bootstrap - * DOCUMENT ME! + * DOCUMENT ME! * @param distances - * DOCUMENT ME! + * DOCUMENT ME! */ public NewickFile(SequenceNode newtree, boolean bootstrap, boolean distances) @@ -175,13 +181,13 @@ public class NewickFile extends FileParse * Creates a new NewickFile object. * * @param newtree - * DOCUMENT ME! + * DOCUMENT ME! * @param bootstrap - * DOCUMENT ME! + * DOCUMENT ME! * @param distances - * DOCUMENT ME! + * DOCUMENT ME! * @param rootdistance - * DOCUMENT ME! + * DOCUMENT ME! */ public NewickFile(SequenceNode newtree, boolean bootstrap, boolean distances, boolean rootdistance) @@ -196,15 +202,15 @@ public class NewickFile extends FileParse * DOCUMENT ME! * * @param Error - * DOCUMENT ME! + * DOCUMENT ME! * @param Er - * DOCUMENT ME! + * DOCUMENT ME! * @param r - * DOCUMENT ME! + * DOCUMENT ME! * @param p - * DOCUMENT ME! + * DOCUMENT ME! * @param s - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -216,8 +222,8 @@ public class NewickFile extends FileParse + " at position " + p + " ( " - + s.substring(((p - r) < 0) ? 0 : (p - r), ((p + r) > s - .length()) ? s.length() : (p + r)) + " )\n"; + + s.substring(((p - r) < 0) ? 0 : (p - r), + ((p + r) > s.length()) ? s.length() : (p + r)) + " )\n"; } // @tree annotations @@ -246,8 +252,8 @@ public class NewickFile extends FileParse * parse the filesource as a newick file (new hampshire and/or extended) * * @throws IOException - * with a line number and character position for badly - * formatted NH strings + * with a line number and character position for badly formatted NH + * strings */ public void parse() throws IOException { @@ -293,6 +299,7 @@ public class NewickFile extends FileParse int nextcp = 0; int ncp = cp; + boolean parsednodename = false; while (majorsyms.searchFrom(nf, cp) && (Error == null)) { int fcp = majorsyms.matchedFrom(); @@ -350,14 +357,21 @@ public class NewickFile extends FileParse case '\'': com.stevesoft.pat.Regex qnodename = new com.stevesoft.pat.Regex( - "([^']|'')+'"); + "'([^']|'')+'"); if (qnodename.searchFrom(nf, fcp)) { int nl = qnodename.stringMatched().length(); - nodename = new String(qnodename.stringMatched().substring(0, + nodename = new String(qnodename.stringMatched().substring(1, nl - 1)); - cp = fcp + nl + 1; + // unpack any escaped colons + com.stevesoft.pat.Regex xpandquotes = com.stevesoft.pat.Regex + .perlCode("s/''/'/"); + String widernodename = xpandquotes.replaceAll(nodename); + nodename = widernodename; + // jump to after end of quoted nodename + nextcp = fcp + nl + 1; + parsednodename = true; } else { @@ -426,7 +440,8 @@ public class NewickFile extends FileParse com.stevesoft.pat.Regex ndist = new com.stevesoft.pat.Regex( ":([-0-9Ee.+]+)"); - if (uqnodename.search(fstring) + if (!parsednodename + && uqnodename.search(fstring) && ((uqnodename.matchedFrom(1) == 0) || (fstring .charAt(uqnodename.matchedFrom(1) - 1) != ':'))) // JBPNote // HACK! @@ -471,8 +486,8 @@ public class NewickFile extends FileParse } catch (Exception e) { Error = ErrorStringrange(Error, - "Can't parse bootstrap value", 4, ncp - + nbootstrap.matchedFrom(), nf); + "Can't parse bootstrap value", 4, + ncp + nbootstrap.matchedFrom(), nf); } } } @@ -489,8 +504,8 @@ public class NewickFile extends FileParse } catch (Exception e) { Error = ErrorStringrange(Error, - "Can't parse node distance value", 7, ncp - + ndist.matchedFrom(), nf); + "Can't parse node distance value", 7, + ncp + ndist.matchedFrom(), nf); } } @@ -585,6 +600,7 @@ public class NewickFile extends FileParse distance = DefDistance; bootstrap = DefBootstrap; commentString2 = null; + parsednodename = false; } if (nextcp == 0) { @@ -599,11 +615,14 @@ public class NewickFile extends FileParse if (Error != null) { - throw (new IOException("NewickFile: " + Error + "\n")); + throw (new IOException(MessageManager.formatMessage( + "exception.newfile", new String[] { Error.toString() }))); } if (root == null) { - throw (new IOException("NewickFile: No Tree read in\n")); + throw (new IOException(MessageManager.formatMessage( + "exception.newfile", new String[] { MessageManager + .getString("label.no_tree_read_in") }))); } // THe next line is failing for topali trees - not sure why yet. if // (root.right()!=null && root.isDummy()) @@ -699,7 +718,7 @@ public class NewickFile extends FileParse * root distances and user specificied writing of bootstraps. * * @param withbootstraps - * controls if bootstrap values are explicitly written. + * controls if bootstrap values are explicitly written. * * @return new hampshire tree in a single line */ @@ -723,9 +742,9 @@ public class NewickFile extends FileParse * node distances. * * @param withbootstraps - * explicitly write bootstrap values + * explicitly write bootstrap values * @param withdists - * explicitly write distances + * explicitly write distances * * @return new hampshire tree in a single line */ @@ -747,11 +766,11 @@ public class NewickFile extends FileParse * Generate newick format tree according to user specified flags * * @param withbootstraps - * explicitly write bootstrap values + * explicitly write bootstrap values * @param withdists - * explicitly write distances + * explicitly write distances * @param printRootInfo - * explicitly write root distance + * explicitly write root distance * * @return new hampshire tree in a single line */ @@ -784,7 +803,7 @@ public class NewickFile extends FileParse * DOCUMENT ME! * * @param c - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -800,7 +819,7 @@ public class NewickFile extends FileParse * DOCUMENT ME! * * @param name - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -820,7 +839,7 @@ public class NewickFile extends FileParse * DOCUMENT ME! * * @param c - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */ @@ -837,7 +856,7 @@ public class NewickFile extends FileParse * DOCUMENT ME! * * @param root - * DOCUMENT ME! + * DOCUMENT ME! * * @return DOCUMENT ME! */