Skip to content

Commit

Permalink
change max to min in leaforder
Browse files Browse the repository at this point in the history
  • Loading branch information
jdfekete committed Apr 27, 2015
1 parent 42736ff commit a162839
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
22 changes: 11 additions & 11 deletions reorder.v1.js
Original file line number Diff line number Diff line change
Expand Up @@ -1591,26 +1591,26 @@ reorder.leafOrder = function() {
if (Ls.length == 0)
Ls = [j];

var max = Infinity, optimal_order = [];
var min = Infinity, optimal_order = [];

for (var k = 0; k < Ks.length; k++) {
var w_max = order(w, i, Ks[k]);
var w_min = order(w, i, Ks[k]);
for (var m = 0; m < Ls.length; m++) {
var x_max = order(x, Ls[m], j);
var dist = w_max[0] + distanceMatrix[Ks[k]][Ls[m]] + x_max[0];
if (dist < max) {
max = dist;
optimal_order = w_max[1].concat(x_max[1]);
var x_min = order(x, Ls[m], j);
var dist = w_min[0] + distanceMatrix[Ks[k]][Ls[m]] + x_min[0];
if (dist < min) {
min = dist;
optimal_order = w_min[1].concat(x_min[1]);
}
}
}
return [max, optimal_order];
return [min, optimal_order];
}

function orderFull(v) {
leavesMap = {};
orderMap = {};
var max = Infinity,
var min = Infinity,
optimal_order = [],
left = leaves(v.left),
right = leaves(v.right);
Expand All @@ -1621,8 +1621,8 @@ reorder.leafOrder = function() {
for (var i = 0; i < left.length; i++) {
for (var j = 0; j < right.length; j++) {
var so = order(v, left[i], right[j]);
if (so[0] < max) {
max = so[0];
if (so[0] < min) {
min = so[0];
optimal_order = so[1];
}
}
Expand Down
Loading

0 comments on commit a162839

Please sign in to comment.