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
FileParse object can be re-used to read different files concatenated together
[jalview.git]
/
src
/
jalview
/
analysis
/
NJTree.java
diff --git
a/src/jalview/analysis/NJTree.java
b/src/jalview/analysis/NJTree.java
index
88bb51c
..
3569be1
100755
(executable)
--- a/
src/jalview/analysis/NJTree.java
+++ b/
src/jalview/analysis/NJTree.java
@@
-794,13
+794,13
@@
public class NJTree
* @return Vector of leaf nodes on binary tree
*/
public Vector findLeaves(SequenceNode node, Vector leaves)
* @return Vector of leaf nodes on binary tree
*/
public Vector findLeaves(SequenceNode node, Vector leaves)
- {
+ {
if (node == null)
{
return leaves;
}
if (node == null)
{
return leaves;
}
- if ( (node.left() == null) && (node.right() == null))
+ if ( (node.left() == null) && (node.right() == null)) // Interior node detection
{
leaves.addElement(node);
{
leaves.addElement(node);
@@
-808,6
+808,10
@@
public class NJTree
}
else
{
}
else
{
+/* TODO: Identify internal nodes... if (node.isSequenceLabel())
+ {
+ leaves.addElement(node);
+ }*/
findLeaves( (SequenceNode) node.left(), leaves);
findLeaves( (SequenceNode) node.right(), leaves);
}
findLeaves( (SequenceNode) node.left(), leaves);
findLeaves( (SequenceNode) node.right(), leaves);
}