git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4023 store distances as doubles
[jalview.git]
/
src
/
jalview
/
io
/
NewickFile.java
diff --git
a/src/jalview/io/NewickFile.java
b/src/jalview/io/NewickFile.java
index
4a30d73
..
027390a
100755
(executable)
--- a/
src/jalview/io/NewickFile.java
+++ b/
src/jalview/io/NewickFile.java
@@
-286,11
+286,11
@@
public class NewickFile extends FileParse
String nodename = null;
String commentString2 = null; // comments after simple node props
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
// 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
int bootstrap = DefBootstrap;
boolean ascending = false; // flag indicating that we are leaving the
@@
-487,7
+487,7
@@
public class NewickFile extends FileParse
{
try
{
{
try
{
- distance = (Float.valueOf(ndist.stringMatched(1))).floatValue();
+ distance = (Double.valueOf(ndist.stringMatched(1))).floatValue();
HasDistances = true;
nodehasdistance = true;
} catch (Exception e)
HasDistances = true;
nodehasdistance = true;
} catch (Exception e)