X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FTreeModel.java;h=106804206cb0de2419fddac6bade5339bf50281b;hb=85299bc2db43c8b108169661ebc1c4d9b2d3d2e5;hp=90fe089809e6c4ac75af13d008cba32bfa68b7f6;hpb=c932f0e85a8852824cdd8ce790af68682732c85c;p=jalview.git diff --git a/src/jalview/analysis/TreeModel.java b/src/jalview/analysis/TreeModel.java index 90fe089..1068042 100644 --- a/src/jalview/analysis/TreeModel.java +++ b/src/jalview/analysis/TreeModel.java @@ -353,7 +353,9 @@ public class TreeModel if ((nd.left() == null) && (nd.right() == null)) { - jalview.bin.Console.outPrintln("Leaf = " + ((SequenceI) nd.element()).getName()); + // TODO FIX FOR COLUMN TREES + jalview.bin.Console + .outPrintln("Leaf = " + ((SequenceI) nd.element()).getName()); jalview.bin.Console.outPrintln("Dist " + nd.dist); jalview.bin.Console.outPrintln("Boot " + nd.getBootstrap()); } @@ -430,7 +432,7 @@ public class TreeModel if ((nd.left() == null) && (nd.right() == null)) { - nd.height = ((BinaryNode) nd.parent()).height + nd.dist; + nd.height = nd.parent().height + nd.dist; if (nd.height > maxheight) { @@ -445,7 +447,7 @@ public class TreeModel { if (nd.parent() != null) { - nd.height = ((BinaryNode) nd.parent()).height + nd.dist; + nd.height = nd.parent().height + nd.dist; } else { @@ -480,7 +482,8 @@ public class TreeModel } else { - jalview.bin.Console.outPrintln(" name = " + ((SequenceI) nd.element()).getName()); + jalview.bin.Console.outPrintln( + " name = " + ((SequenceI) nd.element()).getName()); } jalview.bin.Console.outPrintln( @@ -513,7 +516,8 @@ public class TreeModel { // if (_lycount<_lylimit) // { - // jalview.bin.Console.errPrintln("Warning: depth of _recount greater than number of + // jalview.bin.Console.errPrintln("Warning: depth of _recount greater than + // number of // nodes."); // } if (nd == null)