Merge pull request #34 from xuluze/cmr

Refactor child nodes and indices and Remove parent rows and columns
mkoeppe · Mar 20, 2024 · c4869ae · c4869ae
2 parents b3bf477 + 324de91
commit c4869ae
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 147 deletions.
diff --git a/src/sage/matrix/matrix_cmr_sparse.pyx b/src/sage/matrix/matrix_cmr_sparse.pyx
@@ -1510,10 +1510,8 @@ cdef class Matrix_cmr_chr_sparse(Matrix_cmr_sparse):
             ....:                           certificate=True)
             sage: result, certificate
             (False, (OneSumNode (6×14) with 2 children, NotImplemented))
-            sage: certificate[0].summands()[0].parent_rows_and_columns()
-            ((0, 1, 2), (0, 4, 5, 6, 2, 3, 1))
-            sage: certificate[0].summands()[1].parent_rows_and_columns()
-            ((3, 4, 5), (7, 11, 12, 13, 9, 10, 8))
+            sage: certificate[0].child_indices()
+            (((0, 1, 2), (0, 4, 5, 6, 2, 3, 1)), ((3, 4, 5), (7, 11, 12, 13, 9, 10, 8)))
             sage: unicode_art(certificate[0])  # random (whether the left or the right branch has been followed)
             ╭OneSumNode (6×14) with 2 children╮
             │                                 │

diff --git a/src/sage/matrix/seymour_decomposition.pxd b/src/sage/matrix/seymour_decomposition.pxd
@@ -8,10 +8,7 @@ cdef class DecompositionNode(SageObject):
     cdef CMR_MATROID_DEC *_dec
     cdef object _row_keys
     cdef object _column_keys
-    cdef public object _parent_indices
     cdef object _child_nodes
-    cdef object _child_row_keys
-    cdef object _child_column_keys
 
     cdef _set_dec(self, CMR_MATROID_DEC *dec)
     cdef _set_row_keys(self, row_keys)