WIP

Author: xuluze

src/sage/libs/cmr/cmr.pxd

@@ -488,7 +488,7 @@ cdef extern from "cmr/ctu.h":
     CMR_ERROR CMRctuTest(CMR* cmr, CMR_CHRMAT* matrix, bool* pisComplementTotallyUnimodular, size_t* pcomplementRow, size_t* pcomplementColumn, CMR_CTU_PARAMS* params, CMR_CTU_STATS* stats, double timeLimit)
 
 
-cdef extern from "balanced.h":
+cdef extern from "cmr/balanced.h":
     ctypedef int CMR_BALANCED_ALGORITHM
 
     const int CMR_BALANCED_ALGORITHM_AUTO
@@ -515,40 +515,40 @@ cdef extern from "balanced.h":
     CMR_ERROR CMRbalancedTest(CMR* cmr, CMR_CHRMAT* matrix, bool* pisBalanced, CMR_SUBMAT** psubmatrix, CMR_BALANCED_PARAMS* params, CMR_BALANCED_STATS* stats, double timeLimit)
 
 
-cdef extern from "block_decomposition.h":
-
-    ctypedef struct CMR_BLOCK:
-        CMR_MATRIX* matrix
-        CMR_MATRIX* transpose
-        size_t* rowsToOriginal
-        size_t* columnsToOriginal
-
-    CMR_ERROR CMRdecomposeBlocks(
-        CMR* cmr,
-        CMR_MATRIX* matrix,
-        size_t matrixType,
-        size_t targetType,
-        size_t* pnumBlocks,
-        CMR_BLOCK** pblocks,
-        size_t* rowsToBlock,
-        size_t* columnsToBlock,
-        size_t* rowsToBlockRows,
-        size_t* columnsToBlockColumns
-    )
-
-
-cdef extern from "matrix_internal.h":
-    ctypedef struct CMR_MATRIX:
-        size_t numRows
-        size_t numColumns
-        size_t numNonzeros
-        size_t* rowSlice
-        size_t* entryColumns
-        void* entryValues
-
-    CMR_ERROR CMRsortSubmatrix(CMR* cmr, CMR_SUBMAT* submatrix)
-
-    CMR_ERROR CMRchrmatFilter(CMR* cmr, CMR_CHRMAT* matrix, size_t numRows, size_t* rows, size_t numColumns, size_t* columns, CMR_CHRMAT** presult)
+# cdef extern from "cmr/block_decomposition.h":
+
+#     ctypedef struct CMR_BLOCK:
+#         CMR_MATRIX* matrix
+#         CMR_MATRIX* transpose
+#         size_t* rowsToOriginal
+#         size_t* columnsToOriginal
+
+#     CMR_ERROR CMRdecomposeBlocks(
+#         CMR* cmr,
+#         CMR_MATRIX* matrix,
+#         size_t matrixType,
+#         size_t targetType,
+#         size_t* pnumBlocks,
+#         CMR_BLOCK** pblocks,
+#         size_t* rowsToBlock,
+#         size_t* columnsToBlock,
+#         size_t* rowsToBlockRows,
+#         size_t* columnsToBlockColumns
+#     )
+
+
+# cdef extern from "cmr/matrix_internal.h":
+#     ctypedef struct CMR_MATRIX:
+#         size_t numRows
+#         size_t numColumns
+#         size_t numNonzeros
+#         size_t* rowSlice
+#         size_t* entryColumns
+#         void* entryValues
+
+#     CMR_ERROR CMRsortSubmatrix(CMR* cmr, CMR_SUBMAT* submatrix)
+
+#     CMR_ERROR CMRchrmatFilter(CMR* cmr, CMR_CHRMAT* matrix, size_t numRows, size_t* rows, size_t numColumns, size_t* columns, CMR_CHRMAT** presult)
 
 
 # Our global CMR environment

src/sage/matrix/matrix_cmr_sparse.pyx

@@ -1460,14 +1460,14 @@ cdef _cmr_dec_construct(param):
     return CMR_DEC_CONSTRUCT_ALL
 
 
-cdef _set_cmr_regular_parameters(CMR_REGULAR_PARAMS* params, dict kwds):
+cdef _set_cmr_regular_parameters(CMR_REGULAR_PARAMS *params, dict kwds):
     CMR_CALL(CMRregularParamsInit(params))
     params.directGraphicness = kwds['use_direct_graphicness_test']
     params.seriesParallel = kwds['series_parallel_ok']
     params.planarityCheck = kwds['check_graphic_minors_planar']
     params.completeTree = kwds['complete_tree'] is True
-    params.matrices = _cmr_dec_construct(kwds['construct_matrices'])
-    params.transposes = _cmr_dec_construct(kwds['construct_transposes'])
+    # params.threeSumPivotChildren = _cmr_dec_construct(kwds['construct_matrices'])
+    # params.threeSumStrategy = _cmr_dec_construct(kwds['construct_transposes'])
     params.graphs = _cmr_dec_construct(kwds['construct_graphs'])
 
 

src/sage/matrix/seymour_decomposition.pyx

@@ -451,17 +451,19 @@ cdef class BaseGraphicNode(DecompositionNode):
             sage: certificate.forest_edges()
             ((1, 2), (7, 1))
         """
-        cdef CMR_GRAPH *graph = CMRmatroiddecGraph(self._dec)
-        cdef size_t num_edges = CMRmatroiddecGraphSizeForest(self._dec)
-        cdef CMR_GRAPH_EDGE *edges = CMRmatroiddecGraphForest(self._dec)
-        return tuple(_sage_edge(graph, edges[i]) for i in range(num_edges))
+        pass
+        # cdef CMR_GRAPH *graph = CMRmatroiddecGraph(self._dec)
+        # cdef size_t num_edges = CMRmatroiddecGraphSizeForest(self._dec)
+        # cdef CMR_GRAPH_EDGE *edges = CMRmatroiddecGraphForest(self._dec)
+        # return tuple(_sage_edge(graph, edges[i]) for i in range(num_edges))
 
     @cached_method
     def coforest_edges(self):
-        cdef CMR_GRAPH *graph = CMRmatroiddecGraph(self._dec)
-        cdef size_t num_edges = CMRmatroiddecGraphSizeCoforest(self._dec)
-        cdef CMR_GRAPH_EDGE *edges = CMRmatroiddecGraphCoforest(self._dec)
-        return tuple(_sage_edge(graph, edges[i]) for i in range(num_edges))
+        pass
+        # cdef CMR_GRAPH *graph = CMRmatroiddecGraph(self._dec)
+        # cdef size_t num_edges = CMRmatroiddecGraphSizeCoforest(self._dec)
+        # cdef CMR_GRAPH_EDGE *edges = CMRmatroiddecGraphCoforest(self._dec)
+        # return tuple(_sage_edge(graph, edges[i]) for i in range(num_edges))
 
 
 cdef class GraphicNode(BaseGraphicNode):