Gaussian HMC in Cooling Gaussian

GeomScale · May 27, 2024 · cca44a0 · cca44a0
1 parent 9114f37
commit cca44a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/include/random_walks/gaussian_hamiltonian_monte_carlo_exact_walk.hpp b/include/random_walks/gaussian_hamiltonian_monte_carlo_exact_walk.hpp
@@ -271,5 +271,4 @@ private :
 };
 
 
-#endif // RANDOM_WALKS_GAUSSIAN_HMC_WALK_HPP
-
+#endif // RANDOM_WALKS_GAUSSIAN_HMC_WALK_HPP
diff --git a/include/volume/volume_cooling_gaussians.hpp b/include/volume/volume_cooling_gaussians.hpp
@@ -19,9 +19,7 @@
 #include <chrono>
 
 #include "cartesian_geom/cartesian_kernel.h"
-#include "random_walks/gaussian_helpers.hpp"
-#include "random_walks/gaussian_ball_walk.hpp"
-#include "random_walks/gaussian_cdhr_walk.hpp"
+#include "random_walks/random_walks.hpp"
 #include "sampling/random_point_generators.hpp"
 #include "volume/math_helpers.hpp"
 
@@ -457,7 +455,7 @@ double volume_cooling_gaussians(Polytope& Pin,
 
 template
 <
-    typename WalkTypePolicy = GaussianCDHRWalk,
+    typename WalkTypePolicy = GaussianHamiltonianMonteCarloExactWalk,
     typename RandomNumberGenerator = BoostRandomNumberGenerator<boost::mt11213b, double>,
     typename Polytope
 >
@@ -472,7 +470,7 @@ double volume_cooling_gaussians(Polytope &Pin,
 
 template
 <
-    typename WalkTypePolicy = GaussianCDHRWalk,
+    typename WalkTypePolicy = GaussianHamiltonianMonteCarloExactWalk,
     typename RandomNumberGenerator = BoostRandomNumberGenerator<boost::mt11213b, double>,
     typename Polytope
 >
@@ -487,4 +485,4 @@ double volume_cooling_gaussians(Polytope &Pin,
     return volume_cooling_gaussians<WalkTypePolicy>(Pin, rng, error, walk_length);
 }
 
-#endif // VOLUME_COOLING_GAUSSIANS_HPP
+#endif // VOLUME_COOLING_GAUSSIANS_HPP
Original file line number	Diff line number	Diff line change
Expand Up		@@ -271,5 +271,4 @@ private :
		};


		#endif // RANDOM_WALKS_GAUSSIAN_HMC_WALK_HPP

		#endif // RANDOM_WALKS_GAUSSIAN_HMC_WALK_HPP