fix outdated example

GeomScale · Jul 19, 2024 · 288e422 · 288e422
1 parent c9e41d5
commit 288e422
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/examples/sampling-hpolytope-with-billiard-walks/sampler.cpp b/examples/sampling-hpolytope-with-billiard-walks/sampler.cpp
@@ -7,6 +7,7 @@
 #include "sampling/random_point_generators.hpp"
 #include "random_walks/random_walks.hpp"
 #include "preprocess/max_inscribed_ellipsoid.hpp"
+#include "preprocess/inscribed_ellipsoid_rounding.hpp"
 #include "convex_bodies/ellipsoid.h"
 #include "convex_bodies/hpolytope.h"
 
@@ -69,23 +70,18 @@ void sample_using_gaussian_billiard_walk(HPOLYTOPE& HP, RNGType& rng, unsigned i
     Point q(HP.dimension()); // origin
 
     // ----------- Get inscribed ellipsoid --------------------------------
-    typedef Ellipsoid<Point> EllipsoidType;
     unsigned int max_iter = 150;
     NT tol = std::pow(10, -6.0), reg = std::pow(10, -4.0);
     VT x0 = q.getCoefficients();
-    MT E;
     VT center;
     bool converged;
-    std::tie(E, center, converged) = max_inscribed_ellipsoid<MT>(HP.get_mat(),
-        HP.get_vec(), x0, max_iter, tol, reg);
-
-    if (!converged) // not converged
-        throw std::runtime_error("max_inscribed_ellipsoid not converged");
-
-    EllipsoidType inscribed_ellipsoid(E);
+    std::tuple<MT, VT, NT> ellipsoid = compute_inscribed_ellipsoid<MT, EllipsoidType::VOLUMETRIC_BARRIER>
+    (HP.get_mat(), HP.get_vec(), x0, max_iter, tol, reg);
+
+    const MT E = get<0>(ellipsoid);
     // --------------------------------------------------------------------
 
-    Generator::apply(HP, q, inscribed_ellipsoid, num_points, walk_len,
+    Generator::apply(HP, q, E, num_points, walk_len,
                      randPoints, push_back_policy, rng);
     write_to_file(filename, randPoints);
 }

diff --git a/include/random_walks/gaussian_accelerated_billiard_walk.hpp b/include/random_walks/gaussian_accelerated_billiard_walk.hpp
@@ -25,13 +25,13 @@
 #include "random_walks/compute_diameter.hpp"
 
 
-struct GABW
+struct GaussianAcceleratedBilliardWalk
 {
-    GABW(double L)
+    GaussianAcceleratedBilliardWalk(double L)
             :   param(L, true)
     {}
 
-    GABW()
+    GaussianAcceleratedBilliardWalk()
             :   param(0, false)
     {}
 

diff --git a/include/sampling/random_point_generators.hpp b/include/sampling/random_point_generators.hpp
@@ -95,7 +95,7 @@ struct MultivariateGaussianRandomPointGenerator
         Walk walk(P, p, E, rng, parameters);
         for (unsigned int i=0; i<rnum; ++i)
         {
-            walk.template apply(P, p, E, walk_length, rng);
+            walk.template apply(P, p, walk_length, rng);
             policy.apply(randPoints, p);
         }
     }

diff --git a/test/sampling_test.cpp b/test/sampling_test.cpp
@@ -304,7 +304,7 @@ void call_test_ghmc(){
     CHECK(score.maxCoeff() < 2.2);
 }
 
-template <typename NT, typename WalkType = GABW>
+template <typename NT, typename WalkType = GaussianAcceleratedBilliardWalk>
 void call_test_gabw(){
     typedef Cartesian<NT>    Kernel;
     typedef typename Kernel::Point    Point;
@@ -325,7 +325,7 @@ void call_test_gabw(){
 
 
     Point p = P.ComputeInnerBall().first;
-    typedef typename GABW::template Walk
+    typedef typename GaussianAcceleratedBilliardWalk::template Walk
             <
                     Hpolytope,
                     RNGType