Skip to content

Commit

Permalink
Merge branch 'tier4/main' into refactor/multigrid_ndt_omp
Browse files Browse the repository at this point in the history
  • Loading branch information
SakodaShintaro committed Mar 13, 2024
2 parents fce6546 + 19b30f0 commit 4a615a2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/multigrid_pclomp/multigrid_ndt_omp_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -582,11 +582,11 @@ double pclomp::MultiGridNormalDistributionsTransform<PointSource, PointTarget>::
for(int i = 0; i < 6; ++i) {
// Sigma_k^-1 d(T(x,p))/dpi, Reusable portion of Equation 6.12 and 6.13 [Magnusson 2009]
// Update gradient, Equation 6.12 [Magnusson 2009]
x_trans4_dot_c_inv4_x_ext_point_hessian_4ij.noalias() = x_trans4_x_c_inv4 * point_hessian_.block<4, 6>(i * 4, 0);
x_trans4_dot_c_inv4_x_ext_point_hessian4ij.noalias() = x_trans4_x_c_inv4 * point_hessian.block<4, 6>(i * 4, 0);

for(int j = 0; j < hessian.cols(); j++) {
// Update hessian, Equation 6.13 [Magnusson 2009]
hessian(i, j) += e_x_cov_x * (-gauss_d2 * x_trans4_dot_c_inv4_x_point_gradient4(i) * x_trans4_dot_c_inv4_x_point_gradient4(j) + x_trans4_dot_c_inv4_x_ext_point_hessian_4ij(j) + point_gradient4_colj_dot_c_inv4_x_point_gradient4_col_i(j, i));
hessian(i, j) += e_x_cov_x * (-gauss_d2 * x_trans4_dot_c_inv4_x_point_gradient4(i) * x_trans4_dot_c_inv4_x_point_gradient4(j) + x_trans4_dot_c_inv4_x_ext_point_hessian4ij(j) + point_gradient4_colj_dot_c_inv4_x_point_gradient4_col_i(j, i));
}
}
}
Expand Down

0 comments on commit 4a615a2

Please sign in to comment.