refactor: BinaryList -> ListOfPairs

Author: kliem

src/sage/data_structures/binary_list.pxd renamed to src/sage/data_structures/list_of_pairs.pxd

@@ -5,7 +5,7 @@ cdef struct pair_s:
     size_t second
 
 @cython.final
-cdef class BinaryList:
+cdef class ListOfPairs:
     cdef pair_s** _lists
     cdef size_t length
 

src/sage/data_structures/binary_list.pyx renamed to src/sage/data_structures/list_of_pairs.pyx

@@ -19,7 +19,7 @@ from sage.rings.integer cimport smallInteger
 # Should be neither exposed nor modified.
 cdef size_t length_per_list = 16348
 
-cdef class BinaryList:
+cdef class ListOfPairs:
     def __dealloc__(self):
         cdef size_t n_lists = self.length // length_per_list
         cdef size_t i
@@ -55,8 +55,8 @@ cdef class BinaryList:
 
         EXAMPLES::
 
-            sage: from sage.data_structures.binary_list import BinaryList
-            sage: l = BinaryList()
+            sage: from sage.data_structures.list_of_pairs import ListOfPairs
+            sage: l = ListOfPairs()
             sage: l[0] = [1, 5]
             sage: l[0]
             (1, 5)
@@ -80,8 +80,8 @@ cdef class BinaryList:
 
         EXAMPLES::
 
-            sage: from sage.data_structures.binary_list import BinaryList
-            sage: l = BinaryList()
+            sage: from sage.data_structures.list_of_pairs import ListOfPairs
+            sage: l = ListOfPairs()
             sage: l[0] = (2, 1)
             sage: l[1] = (1, 2)
             sage: l[0]

src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pxd

@@ -1,10 +1,10 @@
 cimport cython
-from sage.data_structures.binary_list cimport BinaryList
-from sage.structure.sage_object       cimport SageObject
-from .face_iterator                   cimport FaceIterator, CombinatorialFace
-from .list_of_faces                   cimport ListOfFaces
-from .face_data_structure             cimport face_t
-from .polyhedron_face_lattice         cimport PolyhedronFaceLattice
+from sage.data_structures.list_of_pairs cimport ListOfPairs
+from sage.structure.sage_object         cimport SageObject
+from .face_iterator                     cimport FaceIterator, CombinatorialFace
+from .list_of_faces                     cimport ListOfFaces
+from .face_data_structure               cimport face_t
+from .polyhedron_face_lattice           cimport PolyhedronFaceLattice
 
 @cython.final
 cdef class CombinatorialPolyhedron(SageObject):
@@ -25,9 +25,9 @@ cdef class CombinatorialPolyhedron(SageObject):
     cdef tuple _far_face_tuple
     cdef tuple _f_vector
 
-    cdef BinaryList _edges                    # stores edges labeled by vertex indices
-    cdef BinaryList _ridges                   # stores ridges labeled by facet indices
-    cdef BinaryList _face_lattice_incidences  # stores incidences in Hasse diagram labeled indices of the faces
+    cdef ListOfPairs _edges                    # stores edges labeled by vertex indices
+    cdef ListOfPairs _ridges                   # stores ridges labeled by facet indices
+    cdef ListOfPairs _face_lattice_incidences  # stores incidences in Hasse diagram labeled indices of the faces
     cdef PolyhedronFaceLattice _all_faces     # class to generate Hasse diagram incidences
 
     cdef tuple Vrep(self)
@@ -58,6 +58,6 @@ cdef class CombinatorialPolyhedron(SageObject):
     cdef int _compute_edges_or_ridges(self, int dual, bint do_edges) except -1
     cdef size_t _compute_edges_or_ridges_with_iterator(
             self, FaceIterator face_iter, const bint do_atom_rep, const bint do_f_vector,
-            BinaryList edges, size_t* f_vector) except -1
+            ListOfPairs edges, size_t* f_vector) except -1
 
     cdef int _compute_face_lattice_incidences(self) except -1

src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx

@@ -102,9 +102,9 @@ from .conversions \
 from .conversions cimport Vrep_list_to_bit_rep
 from sage.misc.cachefunc            import cached_method
 
-from sage.data_structures.binary_list  cimport pair_s
-from sage.rings.integer                cimport smallInteger
-from cysignals.signals                 cimport sig_check
+from sage.data_structures.list_of_pairs cimport pair_s
+from sage.rings.integer                 cimport smallInteger
+from cysignals.signals                  cimport sig_check
 
 from .face_data_structure cimport face_len_atoms, face_init, face_free
 from .face_iterator cimport iter_t, parallel_f_vector
@@ -3575,7 +3575,7 @@ cdef class CombinatorialPolyhedron(SageObject):
         cdef FaceIterator face_iter
         cdef int dim = self.dimension()
 
-        cdef BinaryList edges = BinaryList()
+        cdef ListOfPairs edges = ListOfPairs()
         cdef int output_dim_init = 1 if do_edges else dim - 2
 
         cdef bint do_f_vector = False
@@ -3644,7 +3644,7 @@ cdef class CombinatorialPolyhedron(SageObject):
 
     cdef size_t _compute_edges_or_ridges_with_iterator(
             self, FaceIterator face_iter, const bint do_atom_rep, const bint do_f_vector,
-            BinaryList edges, size_t* f_vector) except -1:
+            ListOfPairs edges, size_t* f_vector) except -1:
         r"""
         See :meth:`CombinatorialPolyhedron._compute_edges`.
         """
@@ -3714,7 +3714,7 @@ cdef class CombinatorialPolyhedron(SageObject):
         # For ``dimension_one`` we add:
         cdef size_t already_seen_next  # = sum(f_vector[j] for j in range(dimension_two + 2))
 
-        cdef BinaryList incidences = BinaryList()
+        cdef ListOfPairs incidences = ListOfPairs()
 
         if all_faces is None:
             raise ValueError("could not determine a list of all faces")