X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FNewickFile.java;h=f3eaa45e2882fd08445dbbc85fbb8848bc46de6d;hb=8946f41687f4c822ac8d15ee8551f23f156735c4;hp=765ea9520a9a1295bc40756aab07497593dfbd59;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java index 765ea95..f3eaa45 100755 --- a/src/jalview/io/NewickFile.java +++ b/src/jalview/io/NewickFile.java @@ -35,6 +35,8 @@ import java.io.FileReader; import java.io.IOException; import java.util.StringTokenizer; +import com.stevesoft.pat.Regex; + /** * Parse a new hanpshire style tree Caveats: NHX files are NOT supported and the * tree distances and topology are unreliable when they are parsed. TODO: on @@ -87,14 +89,14 @@ public class NewickFile extends FileParse boolean printRootInfo = true; - private com.stevesoft.pat.Regex[] NodeSafeName = new com.stevesoft.pat.Regex[] - { new com.stevesoft.pat.Regex().perlCode("m/[\\[,:'()]/"), // test for + private Regex[] NodeSafeName = new Regex[] { + new Regex().perlCode("m/[\\[,:'()]/"), // test for // requiring // quotes - new com.stevesoft.pat.Regex().perlCode("s/'/''/"), // escaping quote + new Regex().perlCode("s/'/''/"), // escaping quote // characters - new com.stevesoft.pat.Regex().perlCode("s/\\/w/_/") // unqoted whitespace - // transformation + new Regex().perlCode("s/\\/w/_/") // unqoted whitespace + // transformation }; char QuoteChar = '\''; @@ -218,13 +220,10 @@ public class NewickFile extends FileParse private String ErrorStringrange(String Error, String Er, int r, int p, String s) { - return ((Error == null) ? "" : Error) - + Er - + " at position " - + p - + " ( " + return ((Error == null) ? "" : Error) + Er + " at position " + p + " ( " + s.substring(((p - r) < 0) ? 0 : (p - r), - ((p + r) > s.length()) ? s.length() : (p + r)) + " )\n"; + ((p + r) > s.length()) ? s.length() : (p + r)) + + " )\n"; } // @tree annotations @@ -295,7 +294,7 @@ public class NewickFile extends FileParse boolean ascending = false; // flag indicating that we are leaving the // current node - com.stevesoft.pat.Regex majorsyms = new com.stevesoft.pat.Regex( + Regex majorsyms = new Regex( "[(\\['),;]"); int nextcp = 0; @@ -317,8 +316,6 @@ public class NewickFile extends FileParse continue; } - - ; d++; if (c.right() == null) @@ -357,16 +354,16 @@ public class NewickFile extends FileParse // Deal with quoted fields case '\'': - com.stevesoft.pat.Regex qnodename = new com.stevesoft.pat.Regex( + Regex qnodename = new Regex( "'([^']|'')+'"); if (qnodename.searchFrom(nf, fcp)) { int nl = qnodename.stringMatched().length(); - nodename = new String(qnodename.stringMatched().substring(1, - nl - 1)); + nodename = new String( + qnodename.stringMatched().substring(1, nl - 1)); // unpack any escaped colons - com.stevesoft.pat.Regex xpandquotes = com.stevesoft.pat.Regex + Regex xpandquotes = Regex .perlCode("s/''/'/"); String widernodename = xpandquotes.replaceAll(nodename); nodename = widernodename; @@ -387,8 +384,8 @@ public class NewickFile extends FileParse { if (d != -1) { - Error = ErrorStringrange(Error, "Wayward semicolon (depth=" + d - + ")", 7, fcp, nf); + Error = ErrorStringrange(Error, + "Wayward semicolon (depth=" + d + ")", 7, fcp, nf); } // cp advanced at the end of default } @@ -401,7 +398,8 @@ public class NewickFile extends FileParse * '"+nf.substring(cp,fcp)+"'"); } */ // verify termination. - com.stevesoft.pat.Regex comment = new com.stevesoft.pat.Regex("]"); + Regex comment = new Regex( + "]"); if (comment.searchFrom(nf, fcp)) { // Skip the comment field @@ -417,8 +415,6 @@ public class NewickFile extends FileParse Error = ErrorStringrange(Error, "Unterminated comment", 3, fcp, nf); } - - ; } // Parse simpler field strings String fstring = nf.substring(ncp, fcp); @@ -434,15 +430,14 @@ public class NewickFile extends FileParse + fstring.substring(cend + 1); } - com.stevesoft.pat.Regex uqnodename = new com.stevesoft.pat.Regex( + Regex uqnodename = new Regex( "\\b([^' :;\\](),]+)"); - com.stevesoft.pat.Regex nbootstrap = new com.stevesoft.pat.Regex( + Regex nbootstrap = new Regex( "\\s*([0-9+]+)\\s*:"); - com.stevesoft.pat.Regex ndist = new com.stevesoft.pat.Regex( + Regex ndist = new Regex( ":([-0-9Ee.+]+)"); - if (!parsednodename - && uqnodename.search(fstring) + if (!parsednodename && uqnodename.search(fstring) && ((uqnodename.matchedFrom(1) == 0) || (fstring .charAt(uqnodename.matchedFrom(1) - 1) != ':'))) // JBPNote // HACK! @@ -469,26 +464,24 @@ public class NewickFile extends FileParse if (nbootstrap.search(fstring)) { - if (nbootstrap.stringMatched(1).equals( - uqnodename.stringMatched(1))) + if (nbootstrap.stringMatched(1) + .equals(uqnodename.stringMatched(1))) { nodename = null; // no nodename here. } - if (nodename == null - || nodename.length() == 0 - || nbootstrap.matchedFrom(1) > (uqnodename.matchedFrom(1) + uqnodename - .stringMatched().length())) + if (nodename == null || nodename.length() == 0 + || nbootstrap.matchedFrom(1) > (uqnodename.matchedFrom(1) + + uqnodename.stringMatched().length())) { try { - bootstrap = (new Integer(nbootstrap.stringMatched(1))) + bootstrap = (Integer.valueOf(nbootstrap.stringMatched(1))) .intValue(); HasBootstrap = true; } catch (Exception e) { - Error = ErrorStringrange(Error, - "Can't parse bootstrap value", 4, - ncp + nbootstrap.matchedFrom(), nf); + Error = ErrorStringrange(Error, "Can't parse bootstrap value", + 4, ncp + nbootstrap.matchedFrom(), nf); } } } @@ -499,7 +492,7 @@ public class NewickFile extends FileParse { try { - distance = (new Float(ndist.stringMatched(1))).floatValue(); + distance = (Float.valueOf(ndist.stringMatched(1))).floatValue(); HasDistances = true; nodehasdistance = true; } catch (Exception e) @@ -565,8 +558,7 @@ public class NewickFile extends FileParse if ((d > -1) && (c == null)) { - Error = ErrorStringrange( - Error, + Error = ErrorStringrange(Error, "File broke algorithm: Lost place in tree (is there an extra ')' ?)", 7, fcp, nf); } @@ -616,14 +608,15 @@ public class NewickFile extends FileParse if (Error != null) { - throw (new IOException(MessageManager.formatMessage( - "exception.newfile", new String[] { Error.toString() }))); + throw (new IOException( + MessageManager.formatMessage("exception.newfile", new String[] + { Error.toString() }))); } if (root == null) { - throw (new IOException(MessageManager.formatMessage( - "exception.newfile", new String[] { MessageManager - .getString("label.no_tree_read_in") }))); + 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()) @@ -666,7 +659,7 @@ public class NewickFile extends FileParse if (code.toLowerCase().equals("b")) { int v = -1; - Float iv = new Float(value); + Float iv = Float.valueOf(value); v = iv.intValue(); // jalview only does integer bootstraps // currently c.setBootstrap(v); @@ -675,8 +668,8 @@ public class NewickFile extends FileParse // more codes here. } catch (Exception e) { - System.err.println("Couldn't parse code '" + code + "' = '" - + value + "'"); + System.err.println( + "Couldn't parse code '" + code + "' = '" + value + "'"); e.printStackTrace(System.err); } } @@ -847,10 +840,10 @@ public class NewickFile extends FileParse private String printNodeField(SequenceNode c) { return ((c.getName() == null) ? "" : nodeName(c.getName())) - + ((HasBootstrap) ? ((c.getBootstrap() > -1) ? ((c.getName() != null ? " " - : "") + c.getBootstrap()) - : "") - : "") + ((HasDistances) ? (":" + c.dist) : ""); + + ((HasBootstrap) ? ((c.getBootstrap() > -1) + ? ((c.getName() != null ? " " : "") + c.getBootstrap()) + : "") : "") + + ((HasDistances) ? (":" + c.dist) : ""); } /** @@ -863,12 +856,16 @@ public class NewickFile extends FileParse */ private String printRootField(SequenceNode root) { - return (printRootInfo) ? (((root.getName() == null) ? "" - : nodeName(root.getName())) - + ((HasBootstrap) ? ((root.getBootstrap() > -1) ? ((root - .getName() != null ? " " : "") + +root.getBootstrap()) - : "") : "") + ((RootHasDistance) ? (":" + root.dist) - : "")) : ""; + return (printRootInfo) + ? (((root.getName() == null) ? "" : nodeName(root.getName())) + + ((HasBootstrap) + ? ((root.getBootstrap() > -1) + ? ((root.getName() != null ? " " : "") + + +root.getBootstrap()) + : "") + : "") + + ((RootHasDistance) ? (":" + root.dist) : "")) + : ""; } // Non recursive call deals with root node properties @@ -941,15 +938,19 @@ public class NewickFile extends FileParse } } - // Test + /** + * + * @param args + * @j2sIgnore + */ public static void main(String[] args) { try { if (args == null || args.length != 1) { - System.err - .println("Takes one argument - file name of a newick tree file."); + System.err.println( + "Takes one argument - file name of a newick tree file."); System.exit(0); } @@ -971,7 +972,7 @@ public class NewickFile extends FileParse trf.parse(); System.out.println("Original file :\n"); - com.stevesoft.pat.Regex nonl = new com.stevesoft.pat.Regex("\n+", ""); + Regex nonl = new Regex("\n+", ""); System.out.println(nonl.replaceAll(newickfile.toString()) + "\n"); System.out.println("Parsed file.\n");