Work on CircuitsMatroid

Add `nonbases` and optimize `is_independent`
gmou3 · Apr 25, 2024 · 9e4eea7 · 9e4eea7
1 parent 8b73efd
commit 9e4eea7
Show file tree

Hide file tree

Showing 3 changed files with 255 additions and 231 deletions.
diff --git a/src/sage/matroids/circuits_matroid.pxd b/src/sage/matroids/circuits_matroid.pxd
@@ -4,23 +4,24 @@ from sage.matroids.set_system cimport SetSystem
 cdef class CircuitsMatroid(Matroid):
     cdef frozenset _groundset  # _E
     cdef int _matroid_rank  # _R
-    cdef SetSystem _C  # circuits
+    cdef set _C  # circuits
     cdef dict _k_C  # k-circuits (k=len)
     cdef bint _nsc_defined
     cpdef groundset(self)
     cpdef _rank(self, X)
     cpdef full_rank(self)
-    cpdef _is_independent(self, F)
-    cpdef _max_independent(self, F)
-    cpdef _circuit(self, F)
+    cpdef _is_independent(self, X)
+    cpdef _max_independent(self, X)
+    cpdef _circuit(self, X)
 
     # enumeration
     cpdef bases(self)
+    cpdef nonbases(self)
     cpdef circuits(self, k=*)
     cpdef nonspanning_circuits(self)
-    cpdef no_broken_circuits_facets(self, ordering=*, reduced=*)
-    cpdef no_broken_circuits_sets(self, ordering=*, reduced=*)
-    cpdef broken_circuit_complex(self, ordering=*, reduced=*)
+    # cpdef no_broken_circuits_facets(self, ordering=*, reduced=*)
+    # cpdef no_broken_circuits_sets(self, ordering=*, reduced=*)
+    # cpdef broken_circuit_complex(self, ordering=*, reduced=*)
 
     # properties
     cpdef girth(self)