fix: fix issues when reading the adjustment matrix

Author: computations

src/AdjustmentMatrix.cpp

@@ -30,6 +30,18 @@ static bool check_duplicates(std::span<const AdjustmentArc> arcs) {
 }
 #endif
 
+void AdjustmentMatrix::normalize_arcs() {
+  if (_type == AdjustmentMatrixType::symmetric) {
+    for (auto& a : _arcs) {
+      if (a.from > a.to) { std::swap(a.from, a.to); }
+    }
+  }
+  std::sort(
+      _arcs.begin(), _arcs.end(), [](const auto& a, const auto& b) -> bool {
+        return a.from < b.from || (a.from == b.from && a.to < b.to);
+      });
+}
+
 /* assume that the matrix is sorted */
 /* need to check that:
  * - No duplicates
@@ -55,7 +67,7 @@ static bool is_valid(std::span<const AdjustmentArc> arcs) {
     return a.size() == b.size();
   });
 
-  return check_duplicates(arcs) && (decreasing != equal);
+  return check_duplicates(arcs) && ((decreasing != increasing) != equal);
 #else
   std::unordered_set<
       std::pair<decltype(AdjustmentArc::from), decltype(AdjustmentArc::to)> >
@@ -82,7 +94,8 @@ void AdjustmentMatrix::read_arcs(CSVReader& reader,
   _region_count = area_names.size();
 #ifdef __cpp_lib_ranges_zip
   auto reverse_area_name_map =
-      std::views::zip(area_names, std::views::iota(0ul, area_names.size()))
+      std::views::zip(std::views::reverse(area_names),
+                      std::views::iota(0ul, area_names.size()))
       | std::ranges::to<std::unordered_map>();
 #else
   std::unordered_map<std::string, size_t> reverse_area_name_map;
@@ -104,11 +117,6 @@ void AdjustmentMatrix::read_arcs(CSVReader& reader,
                        .dist = row.get<double>(dist_key)});
     }
   } catch (std::exception& err) { throw CSVValueError{err.what()}; }
-
-  std::sort(
-      _arcs.begin(), _arcs.end(), [](const auto& a, const auto& b) -> bool {
-        return a.from < b.from || (a.from == b.from && a.to < b.to);
-      });
 }
 
 AdjustmentMatrix::AdjustmentMatrix(const std::filesystem::path& filename,
@@ -152,6 +160,9 @@ AdjustmentMatrix::AdjustmentMatrix(std::istringstream&& matstream,
   }
 
   _type = determine_matrix_symmetry(_arcs, _region_count);
+
+  normalize_arcs();
+  if (!is_valid(_arcs)) { _type = AdjustmentMatrixType::invalid; }
   if (_type == AdjustmentMatrixType::invalid) {
     throw std::runtime_error{"Adjustment matrix is invalid"};
   }
@@ -186,9 +197,6 @@ AdjustmentMatrixType AdjustmentMatrix::determine_matrix_symmetry(
   } else if (arcs.size() == (region_count * (region_count - 1))) {
     type = AdjustmentMatrixType::nonsymmetric;
   }
-  if (type == AdjustmentMatrixType::invalid || !is_valid(arcs)) {
-    return AdjustmentMatrixType::invalid;
-  }
   return type;
 }
 }  // namespace lagrange

src/AdjustmentMatrix.hpp

@@ -43,6 +43,8 @@ class AdjustmentMatrix {
 
   void read_arcs(CSVReader&, const std::vector<std::string>&);
 
+  void normalize_arcs();
+
   size_t _region_count;
   AdjustmentMatrixType _type;
   std::vector<AdjustmentArc> _arcs;

src/ConfigFile.hpp

@@ -87,7 +87,13 @@ class ConfigFile {
         try {
           p.adjustment_matrix = AdjustmentMatrix{
               p.adjustment_matrix_filename.value(), _area_names};
-        } catch (const std::exception& err) { OllKorrect = false; }
+        } catch (const std::exception& err) {
+          LOG_ERROR("Failed to read adjustment matrix {}: {}",
+                    p.adjustment_matrix_filename->c_str(),
+                    err.what());
+
+          OllKorrect = false;
+        }
       }
     }
     return OllKorrect;

tests/src/adjustment_matrix.cpp

@@ -4,7 +4,7 @@
 TEST(AdjustmentMatrix, simple_symmetric) {
   constexpr auto csv_string =
       "from, to, dist\na, b, 1.0\n a, c, 2.0\n b, c, 3.0";
-  std::vector<std::string> areanames = {"a", "b", "c"};
+  std::vector<std::string> areanames = {"c", "b", "a"};
   lagrange::AdjustmentMatrix adj(std::istringstream{csv_string}, areanames);
   EXPECT_EQ(adj.type(), lagrange::AdjustmentMatrixType::symmetric);
   auto matrix = adj.to_matrix();
@@ -32,7 +32,7 @@ TEST(AdjustmentMatrix, simple_nonsymmetric) {
       "b, c, 3.0\n"
       "b, a, 4.0\n"
       "c, b, 6.0";
-  std::vector<std::string> areanames = {"a", "b", "c"};
+  std::vector<std::string> areanames = {"c", "b", "a"};
   lagrange::AdjustmentMatrix adj(std::istringstream{csv_string}, areanames);
   EXPECT_EQ(adj.type(), lagrange::AdjustmentMatrixType::nonsymmetric);
   auto matrix = adj.to_matrix();