X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FNJTree.java;h=9a39ac0b52e510d9ebd58d48d94ef8a21e15f4ae;hb=refs%2Fheads%2Fbug%2FJAL-4214_system_freeze_when_opening_file_using_gui_in_linux;hp=487e85e6a949ec081aaabb1a45d0e97682e3c903;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/src/jalview/analysis/NJTree.java b/src/jalview/analysis/NJTree.java index 487e85e..9a39ac0 100644 --- a/src/jalview/analysis/NJTree.java +++ b/src/jalview/analysis/NJTree.java @@ -22,7 +22,7 @@ package jalview.analysis; import jalview.api.analysis.ScoreModelI; import jalview.api.analysis.SimilarityParamsI; -import jalview.datamodel.SequenceNode; +import jalview.datamodel.BinaryNode; import jalview.viewmodel.AlignmentViewport; /** @@ -81,7 +81,7 @@ public class NJTree extends TreeBuilder * {@inheritDoc} */ @Override - protected void findNewDistances(SequenceNode nodei, SequenceNode nodej, + protected void findNewDistances(BinaryNode nodei, BinaryNode nodej, double dist) { nodei.dist = ((dist + ri) - rj) / 2; @@ -108,25 +108,25 @@ public class NJTree extends TreeBuilder * @param j */ @Override - protected - void findClusterDistance(int i, int j) + protected void findClusterDistance(int i, int j) { // New distances from cluster i to others double[] newdist = new double[noseqs]; - + double ijDistance = distances.getValue(i, j); for (int l = 0; l < noseqs; l++) { if ((l != i) && (l != j)) { - newdist[l] = (distances.getValue(i, l) + distances.getValue(j, l) - ijDistance) / 2; + newdist[l] = (distances.getValue(i, l) + distances.getValue(j, l) + - ijDistance) / 2; } else { newdist[l] = 0; } } - + for (int ii = 0; ii < noseqs; ii++) { distances.setValue(i, ii, newdist[ii]);