rename max_inscribed_ellipsoid_rounding to inscribed_ellipsoid_rounding

Author: TolisChal

examples/count-linear-extensions-using-hpolytope/volesti_lecount.cpp

@@ -10,7 +10,7 @@
 #include "volume_cooling_gaussians.hpp"
 #include "volume_cooling_balls.hpp"
 
-#include "preprocess/max_inscribed_ellipsoid_rounding.hpp"
+#include "preprocess/inscribed_ellipsoid_rounding.hpp"
 #include "preprocess/min_sampling_covering_ellipsoid_rounding.hpp"
 #include "preprocess/svd_rounding.hpp"
 

include/generators/h_polytopes_generator.h

@@ -13,7 +13,7 @@
 #include <boost/random/normal_distribution.hpp>
 #include <boost/random/uniform_real_distribution.hpp>
 
-#include "preprocess/max_inscribed_ellipsoid_rounding.hpp"
+#include "preprocess/inscribed_ellipsoid_rounding.hpp"
 
 #ifndef isnan
   using std::isnan;
@@ -121,7 +121,7 @@ Polytope skinny_random_hpoly(unsigned int dim, unsigned int m, const bool pre_ro
     if (pre_rounding) {
         Point x0(dim);
         // run only one iteration
-        max_inscribed_ellipsoid_rounding<MT, VT, NT>(P, x0, 1);
+        inscribed_ellipsoid_rounding<MT, VT, NT>(P, x0, 1);
     }
 
     MT cov = get_skinny_transformation<MT, VT, RNGType, NT>(dim, eig_ratio, seed);

…ess/max_inscribed_ellipsoid_rounding.hpp …process/inscribed_ellipsoid_rounding.hppinclude/preprocess/max_inscribed_ellipsoid_rounding.hpp renamed to include/preprocess/inscribed_ellipsoid_rounding.hpp include/preprocess/max_inscribed_ellipsoid_rounding.hpp renamed to include/preprocess/inscribed_ellipsoid_rounding.hpp

@@ -8,8 +8,8 @@
 // Licensed under GNU LGPL.3, see LICENCE file
 
 
-#ifndef MAX_ELLIPSOID_ROUNDING_HPP
-#define MAX_ELLIPSOID_ROUNDING_HPP
+#ifndef INSCRIBED_ELLIPSOID_ROUNDING_HPP
+#define INSCRIBED_ELLIPSOID_ROUNDING_HPP
 
 #include "max_inscribed_ellipsoid.hpp"
 
@@ -21,7 +21,7 @@ template
     typename Polytope,
     typename Point   
 >
-std::tuple<MT, VT, NT> max_inscribed_ellipsoid_rounding(Polytope &P, 
+std::tuple<MT, VT, NT> inscribed_ellipsoid_rounding(Polytope &P, 
                                                         Point const& InnerPoint,
                                                         unsigned int const max_iterations = 5,
                                                         NT const max_eig_ratio = NT(6))

test/max_ellipsoid_rounding_test.cpp

@@ -22,7 +22,7 @@
 #include "volume/volume_cooling_gaussians.hpp"
 #include "volume/volume_cooling_balls.hpp"
 
-#include "preprocess/max_inscribed_ellipsoid_rounding.hpp"
+#include "preprocess/inscribed_ellipsoid_rounding.hpp"
 
 #include "generators/known_polytope_generators.h"
 
@@ -64,7 +64,7 @@ void rounding_test(Polytope &HP,
     RNGType rng(d);
 
     std::pair<Point, NT> InnerBall = HP.ComputeInnerBall();
-    std::tuple<MT, VT, NT> res = max_inscribed_ellipsoid_rounding<MT, VT, NT>(HP, InnerBall.first);
+    std::tuple<MT, VT, NT> res = inscribed_ellipsoid_rounding<MT, VT, NT>(HP, InnerBall.first);
 
     // Setup the parameters
     int walk_len = 10;

test/new_rounding_test.cpp

@@ -22,7 +22,7 @@
 #include "volume/volume_cooling_balls.hpp"
 
 #include "preprocess/min_sampling_covering_ellipsoid_rounding.hpp"
-#include "preprocess/max_inscribed_ellipsoid_rounding.hpp"
+#include "preprocess/inscribed_ellipsoid_rounding.hpp"
 #include "preprocess/svd_rounding.hpp"
 
 #include "generators/known_polytope_generators.h"
@@ -110,7 +110,7 @@ void rounding_max_ellipsoid_test(Polytope &HP,
     typedef BoostRandomNumberGenerator<boost::mt19937, NT, 5> RNGType;
     RNGType rng(d);
     std::pair<Point, NT> InnerBall = HP.ComputeInnerBall();
-    std::tuple<MT, VT, NT> res = max_inscribed_ellipsoid_rounding<MT, VT, NT>(HP, InnerBall.first);
+    std::tuple<MT, VT, NT> res = inscribed_ellipsoid_rounding<MT, VT, NT>(HP, InnerBall.first);
 
     // Setup the parameters
     int walk_len = 1;