done porting tests for containers

Author: jlblancoc

CMakeLists.txt.old

@@ -112,24 +112,6 @@ endif()
 # 		CHECK FOR SYSTEM LIBRARIES, OPTIONS, ETC..
 # ----------------------------------------------------------------------------
 
-# Build static or dynamic libs?
-# ===================================================
-# Default: dynamic libraries (except if building to JavaScript code)
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Emscripten")
-	set(_def_value OFF)
-else()
-	set(_def_value ON)
-endif()
-set(BUILD_SHARED_LIBS ${_def_value} CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
-unset(_def_value)
-
-if(BUILD_SHARED_LIBS)
-	set(CMAKE_MRPT_BUILD_SHARED_LIB "#define MRPT_BUILT_AS_DLL")
-	set(CMAKE_MRPT_BUILD_SHARED_LIB_ONOFF 1)
-else()
-	set(CMAKE_MRPT_BUILD_SHARED_LIB "/* #define MRPT_BUILT_AS_DLL */")
-	set(CMAKE_MRPT_BUILD_SHARED_LIB_ONOFF 0)
-endif()
 
 # Only for emscripten: build executables as .html demo pages:
 # =============================================================

modules/mrpt_common/cmake/mrpt_cmake_functions.cmake

@@ -7,11 +7,6 @@
 # Released under BSD-3. See LICENSE file
 # ------------------------------------------------------------------------------
 
-include(GNUInstallDirs) # for install dirs in multilib
-include(CMakePackageConfigHelpers)
-
-find_package(GTest QUIET)
-
 # This file defines utility CMake functions to ensure uniform settings all
 # across MRPT modules, programs, and tests.
 #
@@ -20,6 +15,31 @@ find_package(GTest QUIET)
 # find_package(mrpt_common REQUIRED) # this includes mrpt_cmake_functions.cmake
 #
 
+include(GNUInstallDirs) # for install dirs in multilib
+include(CMakePackageConfigHelpers)
+
+find_package(GTest QUIET)
+
+# Build static or dynamic libs?
+# ===================================================
+# Default: dynamic libraries (except if building to JavaScript code)
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Emscripten")
+	set(_def_value OFF)
+else()
+	set(_def_value ON)
+endif()
+set(BUILD_SHARED_LIBS ${_def_value} CACHE BOOL "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
+unset(_def_value)
+
+if(BUILD_SHARED_LIBS)
+	set(CMAKE_MRPT_BUILD_SHARED_LIB "#define MRPT_BUILT_AS_DLL")
+	set(CMAKE_MRPT_BUILD_SHARED_LIB_ONOFF 1)
+else()
+	set(CMAKE_MRPT_BUILD_SHARED_LIB "/* #define MRPT_BUILT_AS_DLL */")
+	set(CMAKE_MRPT_BUILD_SHARED_LIB_ONOFF 0)
+endif()
+
+
 # ccache:
 if(NOT MSVC AND NOT XCODE_VERSION)
     option(MRPT_BUILD_WITH_CCACHE "Use ccache compiler cache" ON)

modules/mrpt_containers/include/mrpt/containers/CDynamicGrid.h

@@ -87,14 +87,18 @@ class CDynamicGrid
     m_resolution = resolution;
 
     // Now the number of cells should be integers:
-    m_size_x = round((m_x_max - m_x_min) / m_resolution);
-    m_size_y = round((m_y_max - m_y_min) / m_resolution);
+    m_size_x = static_cast<std::size_t>(round((m_x_max - m_x_min) / m_resolution));
+    m_size_y = static_cast<std::size_t>(round((m_y_max - m_y_min) / m_resolution));
 
     // Cells memory:
     if (fill_value)
+    {
       m_map.assign(m_size_x * m_size_y, *fill_value);
+    }
     else
+    {
       m_map.resize(m_size_x * m_size_y);
+    }
   }
 
   /** Erase the contents of all the cells. */
@@ -125,7 +129,9 @@ class CDynamicGrid
     // Is resize really necessary?
     if (new_x_min >= m_x_min && new_y_min >= m_y_min && new_x_max <= m_x_max &&
         new_y_max <= m_y_max)
+    {
       return;
+    }
 
     if (new_x_min > m_x_min) new_x_min = m_x_min;
     if (new_x_max < m_x_max) new_x_max = m_x_max;
@@ -153,23 +159,26 @@ class CDynamicGrid
       new_y_max = m_resolution * round(new_y_max / m_resolution);
 
     // Change the map size: Extensions at each side:
-    unsigned int extra_x_izq = round((m_x_min - new_x_min) / m_resolution);
-    unsigned int extra_y_arr = round((m_y_min - new_y_min) / m_resolution);
+    const auto extra_x_left = static_cast<std::size_t>(round((m_x_min - new_x_min) / m_resolution));
+    const auto extra_y_top = static_cast<std::size_t>(round((m_y_min - new_y_min) / m_resolution));
 
-    unsigned int new_size_x = round((new_x_max - new_x_min) / m_resolution);
-    unsigned int new_size_y = round((new_y_max - new_y_min) / m_resolution);
+    const auto new_size_x = static_cast<std::size_t>(round((new_x_max - new_x_min) / m_resolution));
+    const auto new_size_y = static_cast<std::size_t>(round((new_y_max - new_y_min) / m_resolution));
 
     // Reserve new memory:
     grid_data_t new_map;
     new_map.resize(new_size_x * new_size_y, defaultValueNewCells);
 
     // Copy previous rows:
-    unsigned int x, y;
     iterator itSrc, itDst;
-    for (y = 0; y < m_size_y; y++)
+    for (std::size_t y = 0; y < m_size_y; y++)
     {
-      for (x = 0, itSrc = (m_map.begin() + y * m_size_x),
-          itDst = (new_map.begin() + extra_x_izq + (y + extra_y_arr) * new_size_x);
+      const auto idxSrc = static_cast<typename std::vector<T>::difference_type>(y * m_size_x);
+      const auto idxDst = static_cast<typename std::vector<T>::difference_type>(
+          extra_x_left + (y + extra_y_top) * new_size_x);
+
+      std::size_t x;
+      for (x = 0, itSrc = (m_map.begin() + idxSrc), itDst = (new_map.begin() + idxDst);
            x < m_size_x; ++x, ++itSrc, ++itDst)
       {
         *itDst = *itSrc;
@@ -198,7 +207,7 @@ class CDynamicGrid
     const int cy = y2idx(y);
     if (cx < 0 || cx >= static_cast<int>(m_size_x)) return nullptr;
     if (cy < 0 || cy >= static_cast<int>(m_size_y)) return nullptr;
-    return &m_map[cx + cy * m_size_x];
+    return &m_map[static_cast<size_t>(cx) + static_cast<size_t>(cy) * m_size_x];
   }
   /** \overload */
   inline const T* cellByPos(double x, double y) const
@@ -207,7 +216,7 @@ class CDynamicGrid
     const int cy = y2idx(y);
     if (cx < 0 || cx >= static_cast<int>(m_size_x)) return nullptr;
     if (cy < 0 || cy >= static_cast<int>(m_size_y)) return nullptr;
-    return &m_map[cx + cy * m_size_x];
+    return &m_map[static_cast<size_t>(cx) + static_cast<size_t>(cy) * m_size_x];
   }
 
   /** Returns a pointer to the contents of a cell given by its cell indexes,

modules/mrpt_containers/include/mrpt/containers/find_closest.h

@@ -32,15 +32,18 @@ namespace mrpt::containers
  */
 template <typename Container>
 std::optional<std::pair<typename Container::key_type, typename Container::mapped_type>>
-find_closest_with_tolerance(const Container& data, const double x, double tolerance)
+find_closest_with_tolerance(
+    const Container& data,
+    const typename Container::key_type x,
+    const typename Container::key_type tolerance)
 {
   const auto t_min = x - tolerance;
   const auto t_max = x + tolerance;
 
   auto it_lo = data.lower_bound(t_min);
   auto it_hi = data.upper_bound(t_max);
 
-  double min_distance = std::numeric_limits<double>::max();
+  auto min_distance = std::numeric_limits<typename Container::key_type>::max();
   std::optional<std::pair<typename Container::key_type, typename Container::mapped_type>> best;
 
   for (auto it = it_lo; it != it_hi; ++it)
@@ -71,13 +74,16 @@ find_closest_with_tolerance(const Container& data, const double x, double tolera
  */
 template <typename Container>
 std::optional<std::pair<typename Container::key_type, typename Container::mapped_type>>
-find_closest(const Container& data, const double x)
+find_closest(const Container& data, const typename Container::key_type x)
 {
   typename Container::const_iterator its[2] = {data.lower_bound(x), data.upper_bound(x)};
 
-  if (!data.empty() && its[0] != data.begin()) --its[0];
+  if (!data.empty() && its[0] != data.begin())
+  {
+    --its[0];
+  }
 
-  double min_distance = std::numeric_limits<double>::max();
+  auto min_distance = std::numeric_limits<typename Container::key_type>::max();
   std::optional<std::pair<typename Container::key_type, typename Container::mapped_type>> best;
 
   for (const auto& it : its)

modules/mrpt_containers/include/mrpt/containers/ts_hash_map.h

@@ -114,8 +114,15 @@ class ts_hash_map
       return m_vec == o.m_vec && m_idx_outer == o.m_idx_outer && m_idx_inner == o.m_idx_inner;
     }
     bool operator!=(const const_iterator& o) const { return !(*this == o); }
-    const value_type& operator*() const { return (*m_vec)[m_idx_outer][m_idx_inner]; }
-    const value_type* operator->() const { return &(*m_vec)[m_idx_outer][m_idx_inner]; }
+    const value_type& operator*() const
+    {
+      return (*m_vec)[static_cast<std::size_t>(m_idx_outer)][static_cast<std::size_t>(m_idx_inner)];
+    }
+    const value_type* operator->() const
+    {
+      return &(
+          *m_vec)[static_cast<std::size_t>(m_idx_outer)][static_cast<std::size_t>(m_idx_inner)];
+    }
     inline const_iterator operator++(int)
     { /* Post: it++ */
       const_iterator aux = *this;
@@ -143,8 +150,10 @@ class ts_hash_map
           m_idx_inner = 0;
           m_idx_outer++;
         }
-      } while (m_idx_outer < static_cast<int>(m_parent->m_vec.size()) &&
-               !(*m_vec)[m_idx_outer][m_idx_inner].used);
+      } while (
+          m_idx_outer < static_cast<int>(m_parent->m_vec.size()) &&
+          !(*m_vec)[static_cast<std::size_t>(m_idx_outer)][static_cast<std::size_t>(m_idx_inner)]
+               .used);
     }
   };
 
@@ -158,11 +167,13 @@ class ts_hash_map
     }
     value_type& operator*()
     {
-      return (*const_iterator::m_vec)[const_iterator::m_idx_outer][const_iterator::m_idx_inner];
+      return (*const_iterator::m_vec)[static_cast<std::size_t>(const_iterator::m_idx_outer)]
+                                     [static_cast<std::size_t>(const_iterator::m_idx_inner)];
     }
     value_type* operator->()
     {
-      return &(*const_iterator::m_vec)[const_iterator::m_idx_outer][const_iterator::m_idx_inner];
+      return &(*const_iterator::m_vec)[static_cast<std::size_t>(const_iterator::m_idx_outer)]
+                                      [static_cast<std::size_t>(const_iterator::m_idx_inner)];
     }
     inline iterator operator++(int)
     { /* Post: it++ */
@@ -269,7 +280,9 @@ class ts_hash_map
     for (unsigned int i = 0; i < NUM_HAS_TABLE_COLLISIONS_ALLOWED; i++)
     {
       if (match_arr[i].used && match_arr[i].first == key)
-        return const_iterator(m_vec, *this, hash, i);
+      {
+        return const_iterator(m_vec, *this, hash, static_cast<int>(i));
+      }
     }
     return this->end();
   }
@@ -285,7 +298,7 @@ class ts_hash_map
   const_iterator end() const
   {
     auto lck = mrpt::lockHelper(m_mtx);
-    return const_iterator(m_vec, *this, m_vec.size(), 0);
+    return const_iterator(m_vec, *this, static_cast<int>(m_vec.size()), 0);
   }
   iterator begin()
   {
@@ -297,7 +310,7 @@ class ts_hash_map
   iterator end()
   {
     auto lck = mrpt::lockHelper(m_mtx);
-    return iterator(m_vec, *this, m_vec.size(), 0);
+    return iterator(m_vec, *this, static_cast<int>(m_vec.size()), 0);
   }
   /** @} */
 

modules/mrpt_containers/include/mrpt/containers/vector_with_small_size_optimization.h

@@ -64,7 +64,10 @@ class vector_with_small_size_optimization
 
   vector_with_small_size_optimization(size_t n) : m_is_small(n <= small_size), m_size(n)
   {
-    if (!m_is_small) m_v.resize(n);
+    if (!m_is_small)
+    {
+      m_v.resize(n);
+    }
   }
 
   vector_with_small_size_optimization(const vector_with_small_size_optimization& o) { *this = o; }
@@ -74,19 +77,27 @@ class vector_with_small_size_optimization
     m_size = o.m_size;
     m_is_small = o.m_is_small;
     if (m_size > small_size)
+    {
       m_v = o.m_v;
+    }
     else if (m_size > 0)
+    {
       m_a = o.m_a;
+    }
     return *this;
   }
   vector_with_small_size_optimization& operator=(vector_with_small_size_optimization&& o)
   {
     m_size = o.m_size;
     m_is_small = o.m_is_small;
     if (m_size > small_size)
+    {
       m_v = std::move(o.m_v);
+    }
     else if (m_size > 0)
+    {
       m_a = std::move(o.m_a);
+    }
     return *this;
   }
 
@@ -179,7 +190,7 @@ class vector_with_small_size_optimization
       }
       else if (!m_is_small && n <= small_size)
       {
-        std::copy(m_v.begin(), m_v.begin() + n, m_a.begin());
+        std::copy(m_v.begin(), m_v.begin() + static_cast<difference_type>(n), m_a.begin());
       }
     }
     m_size = n;

modules/mrpt_containers/include/mrpt/containers/yaml.h

@@ -226,8 +226,8 @@ class yaml
     bool hasComment(CommentPosition pos) const
     {
       MRPT_START
-      unsigned int posIndex = static_cast<int>(pos);
-      ASSERT_LT_(posIndex, static_cast<int>(CommentPosition::MAX));
+      const auto posIndex = static_cast<unsigned int>(pos);
+      ASSERT_LT_(posIndex, static_cast<unsigned int>(CommentPosition::MAX));
       return comments[posIndex].has_value();
       MRPT_END
     }
@@ -247,8 +247,8 @@ class yaml
     const std::string& comment(CommentPosition pos) const
     {
       MRPT_START
-      unsigned int posIndex = static_cast<int>(pos);
-      ASSERT_LT_(posIndex, static_cast<int>(CommentPosition::MAX));
+      const auto posIndex = static_cast<unsigned int>(pos);
+      ASSERT_LT_(posIndex, static_cast<unsigned int>(CommentPosition::MAX));
       ASSERTMSG_(
           comments[posIndex].has_value(), "Trying to access comment but this node has none.");
       return comments[posIndex].value();
@@ -654,9 +654,8 @@ class yaml
         "on the left hand.");
     operator[](vc.keyname) = vc.value;
     // keyComment:
-    int posIndex = static_cast<int>(vc.position);
-    ASSERT_GE_(posIndex, 0);
-    ASSERT_LT_(posIndex, static_cast<int>(CommentPosition::MAX));
+    unsigned int posIndex = static_cast<unsigned int>(vc.position);
+    ASSERT_LT_(posIndex, static_cast<unsigned int>(CommentPosition::MAX));
     auto& n = keyNode(vc.keyname);
     n.comments[posIndex].emplace(vc.comment);
     return *this;