X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FNewickFile.java;fp=src%2Fjalview%2Fio%2FNewickFile.java;h=8a464a4c6143fb1341b7c2f7c7ed0331b3c5a165;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=db888b7716c53df25d9f5660c7c7ff0852aebd39;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java index db888b7..8a464a4 100755 --- a/src/jalview/io/NewickFile.java +++ b/src/jalview/io/NewickFile.java @@ -41,7 +41,6 @@ import java.util.StringTokenizer; import com.stevesoft.pat.Regex; // TODO This class does not conform to Java standards for field name capitalization. - /** * 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 @@ -359,11 +358,11 @@ public class NewickFile extends FileParse String nodename = null; String commentString2 = null; // comments after simple node props - float DefDistance = (float) 0.001; // @param Default distance for a node - + double DefDistance = (float) 0.001; // @param Default distance for a node - // very very small int DefBootstrap = -1; // @param Default bootstrap for a node - float distance = DefDistance; + double distance = DefDistance; int bootstrap = DefBootstrap; boolean ascending = false; // flag indicating that we are leaving the @@ -560,7 +559,7 @@ public class NewickFile extends FileParse { try { - distance = (Float.valueOf(ndist.stringMatched(1))).floatValue(); + distance = (Double.valueOf(ndist.stringMatched(1))).floatValue(); HasDistances = true; nodehasdistance = true; } catch (Exception e)