🩹 Fix ordering bug in MatrixProvider class (#1512)

* 🩹 Fix bug in matrix provider Fix ordering issue in the case of multiple types of different megacomplexes were combined in the MatrixProvider class. * 📚 Updated changelog
glotaran · Aug 18, 2024 · e53fcd5 · e53fcd5
1 parent 3b06016
commit e53fcd5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -8,6 +8,10 @@
 
 - ✨ Add official Python 3.12 support (#1437)
 
+### 🩹 Bug fixes
+
+- 🩹 Fix ordering bug in MatrixProvider class (#1512)
+
 ### 🚧 Maintenance
 
 -🧹🚇 Remove asv benchmarks and binder integration

diff --git a/glotaran/optimization/matrix_provider.py b/glotaran/optimization/matrix_provider.py
@@ -222,14 +222,15 @@ def combine_megacomplex_matrices(
         tuple[list[str], ArrayLike]:
             The combined clp labels and matrix.
         """
+        if len(matrix_left.shape) < len(matrix_right.shape):
+            matrix_left, matrix_right = matrix_right, matrix_left
+            clp_labels_left, clp_labels_right = clp_labels_right, clp_labels_left
+
         result_clp_labels = clp_labels_left + [
             c for c in clp_labels_right if c not in clp_labels_left
         ]
         result_clp_size = len(result_clp_labels)
 
-        if len(matrix_left.shape) < len(matrix_right.shape):
-            matrix_left, matrix_right = matrix_right, matrix_left
-
         left_index_dependent = len(matrix_left.shape) == 3
         right_index_dependent = len(matrix_right.shape) == 3