utils/logger : fix column iteration order

Author: ManifoldFR

include/aligator/utils/logger.hpp

@@ -1,7 +1,9 @@
 /// @file
-/// @copyright Copyright (C) 2022-2024 LAAS-CNRS, INRIA
+/// @copyright Copyright (C) 2022-2024 LAAS-CNRS, 2022-2025 INRIA
 #pragma once
 
+#include "string-hash.hpp"
+
 #include <string_view>
 #include <boost/unordered_map.hpp>
 
@@ -44,10 +46,12 @@ struct Logger {
   void addEntry(std::string_view name, size_t val);
 
 protected:
-  // sizes and formats
-  boost::unordered_map<std::string_view, std::pair<uint, std::string>>
-      m_colSpecs;
-  boost::unordered_map<std::string_view, std::string> m_currentLine;
+  std::vector<std::string> m_columnNames; // in insertion order
+  boost::unordered_map<std::string_view, std::pair<uint, std::string>,
+                       ExtendedStringHash>
+      m_colSpecs; // column sizes and formats
+  boost::unordered_map<std::string_view, std::string, ExtendedStringHash>
+      m_currentLine; // iterate using order
 };
 
 } // namespace aligator

src/utils/logger.cpp

@@ -1,3 +1,4 @@
+/// @copyright Copyright (C) 2022-2024 LAAS-CNRS, 2022-2025 INRIA
 #include "aligator/utils/logger.hpp"
 
 #include <fmt/color.h>
@@ -13,25 +14,26 @@ void Logger::printHeadline() {
     return;
   std::vector<std::string> formattedCols;
   formattedCols.reserve(m_colSpecs.size());
-  for (const auto &[name, spec] : m_colSpecs) {
+  for (const auto &name : m_columnNames) {
+    const auto &spec = m_colSpecs[name];
     formattedCols.push_back(fmt::format(fstr, name, spec.first + 1));
   }
-  fmt::print(fmt::emphasis::bold, "{}", fmt::join(formattedCols, "┬"));
-  fmt::print("\n");
+  fmt::print(fmt::emphasis::bold, "{}\n", fmt::join(formattedCols, "┬"));
 }
 
 void Logger::log() {
   if (!active)
     return;
   std::vector<std::string_view> cols;
   cols.reserve(m_colSpecs.size());
-  for (const auto &[name, spec] : m_colSpecs) {
+  for (const auto &name : m_columnNames) {
     cols.emplace_back(m_currentLine[name]);
   }
   fmt::print("{}\n", fmt::join(cols, "│"));
 }
 
 void Logger::reset() {
+  m_columnNames.clear();
   m_colSpecs.clear();
   m_currentLine.clear();
 }
@@ -51,17 +53,20 @@ void Logger::finish(bool conv) {
 
 void Logger::addColumn(std::string_view name, uint width,
                        std::string_view format) {
-  m_colSpecs[name] = {width, std::string(format)};
+  m_columnNames.emplace_back(name);
+  m_colSpecs.emplace(name, std::pair(width, std::string(format)));
 }
 
 void Logger::addEntry(std::string_view name, double val) {
   const auto spec = m_colSpecs[name];
-  m_currentLine[name] = fmt::format(fmt::runtime(spec.second), val, spec.first);
+  m_currentLine.insert_or_assign(
+      name, fmt::format(fmt::runtime(spec.second), val, spec.first));
 }
 
 void Logger::addEntry(std::string_view name, size_t val) {
   const auto spec = m_colSpecs[name];
-  m_currentLine[name] = fmt::format(fmt::runtime(spec.second), val, spec.first);
+  m_currentLine.insert_or_assign(
+      name, fmt::format(fmt::runtime(spec.second), val, spec.first));
 }
 
 } // namespace aligator