From 7fc7895e120e88083627e4794e0d3c24fa1d3e21 Mon Sep 17 00:00:00 2001 From: vgnecula Date: Sun, 18 Aug 2024 21:06:08 -0400 Subject: [PATCH] Removed hessian related lines --- ...e_cooling_nonspherical_gaussians_crhmc.hpp | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/include/volume/volume_cooling_nonspherical_gaussians_crhmc.hpp b/include/volume/volume_cooling_nonspherical_gaussians_crhmc.hpp index 21e65cef0..fd5ce185d 100644 --- a/include/volume/volume_cooling_nonspherical_gaussians_crhmc.hpp +++ b/include/volume/volume_cooling_nonspherical_gaussians_crhmc.hpp @@ -85,7 +85,6 @@ NT get_next_gaussian(Polytope& P, typedef typename NonSphericalGaussianFunctor::parameters func_params; typedef crhmc_input> Input; - //typedef crhmc_input Input; typedef crhmc_problem CrhmcProblem; @@ -120,8 +119,6 @@ NT get_next_gaussian(Polytope& P, Input input = convert2crhmc_input>(P, f, g, zerof); - //Input input = convert2crhmc_input(P, f, g, h); - typedef crhmc_problem CrhmcProblem; CrhmcProblem problem = CrhmcProblem(input); @@ -209,7 +206,6 @@ void compute_annealing_schedule(Polytope Pin_copy, typedef typename NonSphericalGaussianFunctor::parameters func_params; typedef crhmc_input> Input; - //typedef crhmc_input Input; typedef crhmc_problem CrhmcProblem; @@ -261,7 +257,6 @@ void compute_annealing_schedule(Polytope Pin_copy, func_params initial_f_params = func_params(Point(dimension), a_vals[0], -1, inv_covariance_matrix); Func initial_f(initial_f_params); Grad initial_g(initial_f_params); - Hess initial_h(initial_f_params); ZeroFunctor initial_zerof; Input initial_input = convert2crhmc_input>(Pin_copy, initial_f, initial_g, initial_zerof); @@ -300,13 +295,10 @@ void compute_annealing_schedule(Polytope Pin_copy, Func f(f_params); Grad g(f_params); - Hess h(f_params); ZeroFunctor zerof; Input input = convert2crhmc_input>(Pin_copy, f, g, zerof); - //Input input = convert2crhmc_input(P, f, g, h); - typedef crhmc_problem CrhmcProblem; CrhmcProblem problem = CrhmcProblem(input); @@ -334,8 +326,7 @@ void compute_annealing_schedule(Polytope Pin_copy, } //restore the new eta and start point, by looking at the walk after its operations - initial_eta = walk.get_current_eta(); - //start_point = walk.getPoint(); + initial_eta = walk.get_current_eta(); // Remove the last gaussian. // Set the last a_i equal to zero @@ -393,11 +384,9 @@ double non_spherical_crhmc_volume_cooling_gaussians(Polytope& Pin, typedef typename Polytope::MT MT; typedef typename NonSphericalGaussianFunctor::FunctionFunctor Func; typedef typename NonSphericalGaussianFunctor::GradientFunctor Grad; - typedef typename NonSphericalGaussianFunctor::HessianFunctor Hess; typedef typename NonSphericalGaussianFunctor::parameters func_params; typedef crhmc_input> Input; - //typedef crhmc_input Input; typedef crhmc_problem CrhmcProblem; typedef ImplicitMidpointODESolver Solver; @@ -418,10 +407,6 @@ double non_spherical_crhmc_volume_cooling_gaussians(Polytope& Pin, Grad > crhmc_walk_params; - // auto P(Pin); //copy and work with P because we are going to shift - // auto newP(Pin); - - typedef HPolytope HPOLYTOPE; HPOLYTOPE P(Pin.dimension(), Pin.get_mat(), Pin.get_vec()); @@ -526,14 +511,11 @@ double non_spherical_crhmc_volume_cooling_gaussians(Polytope& Pin, Func f(f_params); Grad g(f_params); - Hess h(f_params); ZeroFunctor zerof; //create the crhmc problem Input input = convert2crhmc_input>(newPin, f, g, zerof); - //Input input = convert2crhmc_input(P, f, g, h); - typedef crhmc_problem CrhmcProblem; CrhmcProblem problem = CrhmcProblem(input);