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
1.1 compatible
[jalview.git]
/
src
/
jalview
/
analysis
/
NJTree.java
diff --git
a/src/jalview/analysis/NJTree.java
b/src/jalview/analysis/NJTree.java
index
fb0ec33
..
8f3483d
100755
(executable)
--- a/
src/jalview/analysis/NJTree.java
+++ b/
src/jalview/analysis/NJTree.java
@@
-538,8
+538,8
@@
public class NJTree {
\r
float dist = ((SequenceNode)node).dist;
\r
if (dist > maxDistValue) {
\r
\r
float dist = ((SequenceNode)node).dist;
\r
if (dist > maxDistValue) {
\r
- maxdist = (SequenceNode)node;
\r
- maxDistValue = dist;
\r
+ maxdist = (SequenceNode)node;
\r
+ maxDistValue = dist;
\r
}
\r
} else {
\r
findMaxDist((SequenceNode)node.left());
\r
}
\r
} else {
\r
findMaxDist((SequenceNode)node.left());
\r
@@
-547,10
+547,10
@@
public class NJTree {
}
\r
}
\r
public Vector getGroups() {
\r
}
\r
}
\r
public Vector getGroups() {
\r
- return groups;
\r
+ return groups;
\r
}
\r
public float getMaxHeight() {
\r
}
\r
public float getMaxHeight() {
\r
- return maxheight;
\r
+ return maxheight;
\r
}
\r
public void groupNodes(SequenceNode node, float threshold) {
\r
if (node == null) {
\r
}
\r
public void groupNodes(SequenceNode node, float threshold) {
\r
if (node == null) {
\r
@@
-639,8
+639,8
@@
public class NJTree {
}
\r
\r
public void reCount(SequenceNode node) {
\r
}
\r
\r
public void reCount(SequenceNode node) {
\r
- ycount = 0;
\r
- _reCount(node);
\r
+ ycount = 0;
\r
+ _reCount(node);
\r
}
\r
public void _reCount(SequenceNode node) {
\r
if (node == null) {
\r
}
\r
public void _reCount(SequenceNode node) {
\r
if (node == null) {
\r
@@
-664,13
+664,13
@@
public class NJTree {
\r
}
\r
public void swapNodes(SequenceNode node) {
\r
\r
}
\r
public void swapNodes(SequenceNode node) {
\r
- if (node == null) {
\r
- return;
\r
- }
\r
- SequenceNode tmp = (SequenceNode)node.left();
\r
+ if (node == null) {
\r
+ return;
\r
+ }
\r
+ SequenceNode tmp = (SequenceNode)node.left();
\r
\r
\r
- node.setLeft(node.right());
\r
- node.setRight(tmp);
\r
+ node.setLeft(node.right());
\r
+ node.setRight(tmp);
\r
}
\r
public void changeDirection(SequenceNode node, SequenceNode dir) {
\r
if (node == null) {
\r
}
\r
public void changeDirection(SequenceNode node, SequenceNode dir) {
\r
if (node == null) {
\r
@@
-710,13
+710,13
@@
public class NJTree {
}
\r
}
\r
public void setMaxDist(SequenceNode node) {
\r
}
\r
}
\r
public void setMaxDist(SequenceNode node) {
\r
- this.maxdist = maxdist;
\r
+ this.maxdist = maxdist;
\r
}
\r
public SequenceNode getMaxDist() {
\r
}
\r
public SequenceNode getMaxDist() {
\r
- return maxdist;
\r
+ return maxdist;
\r
}
\r
public SequenceNode getTopNode() {
\r
}
\r
public SequenceNode getTopNode() {
\r
- return top;
\r
+ return top;
\r
}
\r
\r
}
\r
}
\r
\r
}
\r