Add iterators, Whitney numbers, characteristic polynomial, etc

Author: gmou3

src/sage/matroids/basis_exchange_matroid.pxd

@@ -61,8 +61,8 @@ cdef class BasisExchangeMatroid(Matroid):
     cpdef _augment(self, X, Y) noexcept
     cpdef _is_independent(self, F) noexcept
 
-    cpdef f_vector(self) noexcept
-    cdef  _f_vector_rec(self, object f_vec, bitset_t* flats, bitset_t* todo, long elt, long rnk) noexcept
+    cpdef whitney_numbers2(self) noexcept
+    cdef  _whitney_numbers2_rec(self, object f_vec, bitset_t* flats, bitset_t* todo, long elt, long rnk) noexcept
     cpdef flats(self, R) noexcept
     cdef  _flats_rec(self, SetSystem Rflats, long R, bitset_t* flats, bitset_t* todo, long elt, long rnk) noexcept
     cpdef coflats(self, R) noexcept

src/sage/matroids/basis_exchange_matroid.pyx

@@ -1232,27 +1232,26 @@ cdef class BasisExchangeMatroid(Matroid):
 
     # enumeration
 
-    cpdef f_vector(self) noexcept:
+    cpdef whitney_numbers2(self) noexcept:
         r"""
-        Return the `f`-vector of the matroid.
+        Return the Whitney numbers of the second kind of the matroid.
 
-        The `f`-*vector* is a vector `(f_0, ..., f_r)`, where `f_i` is the
-        number of flats of rank `i`, and `r` is the rank of the matroid.
+        The Whitney numbers of the second kind are here encoded as a vector
+        `(W_0, ..., W_r)`, where `W_i` is the number of flats of rank `i`, and
+        `r` is the rank of the matroid.
 
-        OUTPUT:
-
-        List of integers.
+        OUTPUT: a list of integers
 
         EXAMPLES::
 
             sage: M = matroids.catalog.S8()
-            sage: M.f_vector()
+            sage: M.whitney_numbers2()
             [1, 8, 22, 14, 1]
         """
         cdef bitset_t *flats
         cdef bitset_t *todo
         if self._matroid_rank == 0:
-            return [0]
+            return [1]
         flats = <bitset_t*>sig_malloc((self.full_rank() + 1) * sizeof(bitset_t))
         todo = <bitset_t*>sig_malloc((self.full_rank() + 1) * sizeof(bitset_t))
 
@@ -1264,17 +1263,17 @@ cdef class BasisExchangeMatroid(Matroid):
         bitset_clear(todo[0])
         self.__closure(flats[0], todo[0])
         bitset_complement(todo[0], flats[0])
-        self._f_vector_rec(f_vec, flats, todo, 0, 0)
+        self._whitney_numbers2_rec(f_vec, flats, todo, 0, 0)
         for i in range(self.full_rank() + 1):
             bitset_free(flats[i])
             bitset_free(todo[i])
         sig_free(flats)
         sig_free(todo)
         return f_vec
 
-    cdef _f_vector_rec(self, object f_vec, bitset_t* flats, bitset_t* todo, long elt, long i) noexcept:
+    cdef _whitney_numbers2_rec(self, object f_vec, bitset_t* flats, bitset_t* todo, long elt, long i) noexcept:
         """
-        Recursion for the f_vector method.
+        Recursion for the whitney_numbers2 method.
         """
         cdef long e
         f_vec[i] += 1
@@ -1287,7 +1286,7 @@ cdef class BasisExchangeMatroid(Matroid):
             bitset_difference(todo[i + 1], flats[i + 1], flats[i])
             if bitset_first(todo[i + 1]) == e:
                 bitset_copy(todo[i + 1], todo[i])
-                self._f_vector_rec(f_vec, flats, todo, e + 1, i + 1)
+                self._whitney_numbers2_rec(f_vec, flats, todo, e + 1, i + 1)
             e = bitset_next(todo[i], e)
 
     cpdef flats(self, r) noexcept:
@@ -1311,7 +1310,7 @@ cdef class BasisExchangeMatroid(Matroid):
         EXAMPLES::
 
             sage: M = matroids.catalog.S8()
-            sage: M.f_vector()
+            sage: M.whitney_numbers2()
             [1, 8, 22, 14, 1]
             sage: len(M.flats(2))
             22
@@ -1386,7 +1385,7 @@ cdef class BasisExchangeMatroid(Matroid):
         EXAMPLES::
 
             sage: M = matroids.catalog.S8().dual()
-            sage: M.f_vector()
+            sage: M.whitney_numbers2()
             [1, 8, 22, 14, 1]
             sage: len(M.coflats(2))
             22
@@ -1957,8 +1956,8 @@ cdef class BasisExchangeMatroid(Matroid):
             else:
                 k = min(self.full_rank() - 1, 2)
                 fie, f_vec = self._flat_element_inv(k)
-                self._weak_invariant_var = hash(tuple([tuple([(f, len(fie[f])) for f in sorted(fie)]), f_vec]))
-                self._weak_partition_var = SetSystem(self._E, [fie[f] for f in sorted(fie)])
+                self._weak_invariant_var = hash(tuple([tuple([(f, len(fie[f])) for f in sorted(fie, key=str)]), f_vec]))
+                self._weak_partition_var = SetSystem(self._E, [fie[f] for f in sorted(fie, key=str)])
         return self._weak_invariant_var
 
     cpdef _weak_partition(self) noexcept:

src/sage/matroids/basis_matroid.pyx

@@ -428,9 +428,9 @@ cdef class BasisMatroid(BasisExchangeMatroid):
             sage: M = Matroid(bases=matroids.catalog.N2().bases())
             sage: M.truncation()
             Matroid of rank 5 on 12 elements with 702 bases
-            sage: M.f_vector()
+            sage: M.whitney_numbers2()
             [1, 12, 66, 190, 258, 99, 1]
-            sage: M.truncation().f_vector()
+            sage: M.truncation().whitney_numbers2()
             [1, 12, 66, 190, 258, 1]
         """
         if self.full_rank() == 0:

src/sage/matroids/database_matroids.py

@@ -541,7 +541,7 @@ def P7():
 
         sage: M = matroids.catalog.P7(); M
         P7: Ternary matroid of rank 3 on 7 elements, type 1+
-        sage: M.f_vector()
+        sage: M.whitney_numbers2()
         [1, 7, 11, 1]
         sage: M.has_minor(matroids.CompleteGraphic(4))
         False

src/sage/matroids/matroid.pxd

@@ -124,6 +124,8 @@ cdef class Matroid(SageObject):
     cpdef coflats(self, r) noexcept
     cpdef hyperplanes(self) noexcept
     cpdef f_vector(self) noexcept
+    cpdef whitney_numbers(self) noexcept
+    cpdef whitney_numbers2(self) noexcept
     cpdef broken_circuits(self, ordering=*) noexcept
     cpdef no_broken_circuits_sets(self, ordering=*) noexcept
 
@@ -213,6 +215,7 @@ cdef class Matroid(SageObject):
     cpdef _internal(self, B) noexcept
     cpdef _external(self, B) noexcept
     cpdef tutte_polynomial(self, x=*, y=*) noexcept
+    cpdef characteristic_polynomial(self, l=*) noexcept
     cpdef flat_cover(self, solver=*, verbose=*, integrality_tolerance=*) noexcept
 
     # misc