Skip to content

Commit

Permalink
Bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
simeks committed Nov 17, 2019
1 parent 42b77cc commit 32122df
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions src/deform_lib/registration/hybrid_graph_cut_optimizer.inl
Original file line number Diff line number Diff line change
Expand Up @@ -538,40 +538,43 @@ void HybridGraphCutOptimizer<TSolver>::minimize_block_task(const Block& block)
current_energy += f0;

if (sub_x + 1 < block_dims.x && gx + 1 < int(full_dims.x)) {
double f_same = _binary_cost_x(gx,gy,gz).x;
double f00 = _binary_cost_x(gx,gy,gz).x;
double f01 = _binary_cost_x(gx,gy,gz).y;
double f10 = _binary_cost_x(gx,gy,gz).z;
double f11 = _binary_cost_x(gx,gy,gz).w;

graph.add_term2(
sub_x, sub_y, sub_z,
sub_x + 1, sub_y, sub_z,
f_same, f01, f10, f_same);
f00, f01, f10, f11);

current_energy += f_same;
current_energy += f00;
}
if (sub_y + 1 < block_dims.y && gy + 1 < int(full_dims.y)) {
double f_same = _binary_cost_y(gx,gy,gz).x;
double f00 = _binary_cost_y(gx,gy,gz).x;
double f01 = _binary_cost_y(gx,gy,gz).y;
double f10 = _binary_cost_y(gx,gy,gz).z;
double f11 = _binary_cost_y(gx,gy,gz).w;

graph.add_term2(
sub_x, sub_y, sub_z,
sub_x, sub_y + 1, sub_z,
f_same, f01, f10, f_same);
f00, f01, f10, f11);

current_energy += f_same;
current_energy += f00;
}
if (sub_z + 1 < block_dims.z && gz + 1 < int(full_dims.z)) {
double f_same = _binary_cost_z(gx,gy,gz).x;
double f00 = _binary_cost_z(gx,gy,gz).x;
double f01 = _binary_cost_z(gx,gy,gz).y;
double f10 = _binary_cost_z(gx,gy,gz).z;
double f11 = _binary_cost_z(gx,gy,gz).w;

graph.add_term2(
sub_x, sub_y, sub_z,
sub_x, sub_y, sub_z + 1,
f_same, f01, f10, f_same);
f00, f01, f10, f11);

current_energy += f_same;
current_energy += f00;
}
}
}
Expand Down

0 comments on commit 32122df

Please sign in to comment.