Addressing LTO warnings.

Author: kylesnap

src/cpp11.cpp

@@ -27,17 +27,17 @@ extern "C" SEXP _ernest_logspace_cumsum_mat(SEXP x) {
   END_CPP11
 }
 // propose-impl.cpp
-cpp11::list RandomWalkImpl(cpp11::doubles original, cpp11::function unit_log_fn, double criterion, int steps, double epsilon);
+cpp11::list RandomWalkImpl(cpp11::doubles original, cpp11::function unit_log_fn, double criterion, unsigned int steps, double epsilon);
 extern "C" SEXP _ernest_RandomWalkImpl(SEXP original, SEXP unit_log_fn, SEXP criterion, SEXP steps, SEXP epsilon) {
   BEGIN_CPP11
-    return cpp11::as_sexp(RandomWalkImpl(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(original), cpp11::as_cpp<cpp11::decay_t<cpp11::function>>(unit_log_fn), cpp11::as_cpp<cpp11::decay_t<double>>(criterion), cpp11::as_cpp<cpp11::decay_t<int>>(steps), cpp11::as_cpp<cpp11::decay_t<double>>(epsilon)));
+    return cpp11::as_sexp(RandomWalkImpl(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(original), cpp11::as_cpp<cpp11::decay_t<cpp11::function>>(unit_log_fn), cpp11::as_cpp<cpp11::decay_t<double>>(criterion), cpp11::as_cpp<cpp11::decay_t<unsigned int>>(steps), cpp11::as_cpp<cpp11::decay_t<double>>(epsilon)));
   END_CPP11
 }
 // propose-impl.cpp
-cpp11::list SliceImpl(cpp11::doubles original, cpp11::function unit_log_fn, double criterion, cpp11::doubles lower, cpp11::doubles upper, const int max_loop);
+cpp11::list SliceImpl(cpp11::doubles original, cpp11::function unit_log_fn, double criterion, cpp11::doubles lower, cpp11::doubles upper, unsigned int max_loop);
 extern "C" SEXP _ernest_SliceImpl(SEXP original, SEXP unit_log_fn, SEXP criterion, SEXP lower, SEXP upper, SEXP max_loop) {
   BEGIN_CPP11
-    return cpp11::as_sexp(SliceImpl(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(original), cpp11::as_cpp<cpp11::decay_t<cpp11::function>>(unit_log_fn), cpp11::as_cpp<cpp11::decay_t<double>>(criterion), cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(lower), cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(upper), cpp11::as_cpp<cpp11::decay_t<const int>>(max_loop)));
+    return cpp11::as_sexp(SliceImpl(cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(original), cpp11::as_cpp<cpp11::decay_t<cpp11::function>>(unit_log_fn), cpp11::as_cpp<cpp11::decay_t<double>>(criterion), cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(lower), cpp11::as_cpp<cpp11::decay_t<cpp11::doubles>>(upper), cpp11::as_cpp<cpp11::decay_t<unsigned int>>(max_loop)));
   END_CPP11
 }
 // update_lrps-impl.cpp

src/ellipsoid.cpp

@@ -213,7 +213,8 @@ std::list<Ellipsoid> vol::Ellipsoid::Split(const ConstRef<Matrix> X,
   }
 
   // BASE CASE 1: Clusters too small to split
-  if (idx0.size() < 2 * nvar_ || idx1.size() < 2 * nvar_) {
+  unsigned int twice_nvar = 2 * nvar_;
+  if (idx0.size() < twice_nvar || idx1.size() < twice_nvar) {
     return {*this};
   }
 

src/propose-impl.cpp

@@ -14,7 +14,7 @@
 // Proposal: X' ~ N(X_n, ε I).
 [[cpp11::register]]
 cpp11::list RandomWalkImpl(cpp11::doubles original, cpp11::function unit_log_fn,
-                           double criterion, int steps, double epsilon) {
+                           double criterion, unsigned int steps, double epsilon) {
   const int nvar = original.size();
   ern::RandomEngine rng;
 
@@ -47,7 +47,7 @@ cpp11::list RandomWalkImpl(cpp11::doubles original, cpp11::function unit_log_fn,
 [[cpp11::register]]
 cpp11::list SliceImpl(cpp11::doubles original, cpp11::function unit_log_fn,
                       double criterion, cpp11::doubles lower, cpp11::doubles upper,
-                      const int max_loop) {
+                      unsigned int max_loop) {
   // Setups
   vol::Rectangle rect(lower, upper);
   Eigen::VectorXd next_draw = as_Matrix(original);

src/rectangle.h

@@ -16,7 +16,7 @@ namespace vol {
 class Rectangle {
  public:
   // Construct the (0-1) unit hypercube.
-  inline explicit Rectangle(const int nvar)
+  inline explicit Rectangle(const unsigned int nvar)
       : nvar_(nvar),
         lower_(Eigen::ArrayXd::Zero(nvar_)),
         upper_(Eigen::ArrayXd::Ones(nvar_)) {};
@@ -70,7 +70,7 @@ class Rectangle {
   inline Vector upper() const { return upper_; }
 
  private:
-  int nvar_;              // Number of dimensions
+  unsigned int nvar_;     // Number of dimensions
   Eigen::ArrayXd lower_;  // Lower bounds of the rectangle axes.
   Eigen::ArrayXd upper_;  // Upper bounds of the rectangle axes.
   ern::RandomEngine gen;  // Random number generator.

src/test-bounding.cpp

@@ -75,8 +75,6 @@ context("Ellipsoid class - basic functionality") {
     expect_true(ern::isZero(err_in, 1e-3));
     expect_true(ern::isZero(err_out, 1e-3));
   }
-
-  Eigen::Matrix2d shape = Eigen::Matrix2d::Identity();
 }
 
 context("Ellipsoid class - geometric cases") {

src/utils.h

@@ -68,7 +68,7 @@ inline bool IsOutsideUnitCube(ConstRef<RowVector> vec) {
 
 // Reflects components of `vec` to ensure all lie within the unit cube [0,1]^d.
 inline void ReflectWithinUnitCube(Ref<RowVector> vec) {
-  for (size_t i = 0; i < vec.size(); ++i) {
+  for (long int i = 0; i < vec.size(); ++i) {
     double val = vec[i];
     bool idx_even = std::fmod(val, 2.0) < 1.0;
     if (idx_even) {