sage.geometry: Use yet more block tags

Author: Matthias Koeppe

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

@@ -2903,18 +2903,18 @@ cdef class CombinatorialPolyhedron(SageObject):
             sage: # needs sage.graphs sage.rings.number_field
             sage: P = polytopes.regular_polygon(4).pyramid()
             sage: C = CombinatorialPolyhedron(P)
-            sage: D = C.hasse_diagram(); D                                              # needs sage.graphs
+            sage: D = C.hasse_diagram(); D
             Digraph on 20 vertices
-            sage: D.average_degree()                                                    # needs sage.graphs
+            sage: D.average_degree()
             21/5
-            sage: D.relabel(C.face_by_face_lattice_index)                               # needs sage.graphs
-            sage: dim_0_vert = D.vertices(sort=True)[1:6]; dim_0_vert                   # needs sage.graphs
+            sage: D.relabel(C.face_by_face_lattice_index)
+            sage: dim_0_vert = D.vertices(sort=True)[1:6]; dim_0_vert
             [A 0-dimensional face of a 3-dimensional combinatorial polyhedron,
              A 0-dimensional face of a 3-dimensional combinatorial polyhedron,
              A 0-dimensional face of a 3-dimensional combinatorial polyhedron,
              A 0-dimensional face of a 3-dimensional combinatorial polyhedron,
              A 0-dimensional face of a 3-dimensional combinatorial polyhedron]
-            sage: sorted(D.out_degree(vertices=dim_0_vert))                             # needs sage.graphs
+            sage: sorted(D.out_degree(vertices=dim_0_vert))
             [3, 3, 3, 3, 4]
         """
         if not self._face_lattice_incidences:
@@ -3000,13 +3000,13 @@ cdef class CombinatorialPolyhedron(SageObject):
             sage: # needs sage.combinat
             sage: P = polytopes.cube()
             sage: C = CombinatorialPolyhedron(P)
-            sage: F = C.face_lattice()                                                  # needs sage.combinat
-            sage: F                                                                     # needs sage.combinat
+            sage: F = C.face_lattice()
+            sage: F
             Finite lattice containing 28 elements
-            sage: G = F.relabel(C.face_by_face_lattice_index)                           # needs sage.combinat
-            sage: G.level_sets()[0]                                                     # needs sage.combinat
+            sage: G = F.relabel(C.face_by_face_lattice_index)
+            sage: G.level_sets()[0]
             [A -1-dimensional face of a 3-dimensional combinatorial polyhedron]
-            sage: G.level_sets()[3]                                                     # needs sage.combinat
+            sage: G.level_sets()[3]
             [A 2-dimensional face of a 3-dimensional combinatorial polyhedron,
              A 2-dimensional face of a 3-dimensional combinatorial polyhedron,
              A 2-dimensional face of a 3-dimensional combinatorial polyhedron,

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

@@ -34,9 +34,9 @@ Obtain the Vrepresentation of a polyhedron as facet-incidences stored in
     sage: # needs sage.combinat
     sage: from sage.geometry.polyhedron.combinatorial_polyhedron.conversions \
     ....:         import incidence_matrix_to_bit_rep_of_Vrep
-    sage: P = polytopes.associahedron(['A',4])                                          # needs sage.combinat
+    sage: P = polytopes.associahedron(['A',4])
     sage: face_list = incidence_matrix_to_bit_rep_of_Vrep(P.incidence_matrix())
-    sage: face_list.compute_dimension()                                                 # needs sage.combinat
+    sage: face_list.compute_dimension()
     4
 
 Obtain the facets of a polyhedron as :class:`~sage.geometry.polyhedron.combinatorial_polyhedron.list_of_faces.ListOfFaces` from a facet list::

src/sage/geometry/triangulation/point_configuration.py

@@ -112,15 +112,15 @@
     sage: PointConfiguration.set_engine('topcom')
     sage: p = PointConfiguration([[-1,-5/9], [0,10/9], [1,-5/9],
     ....:                         [-2,-10/9], [0,20/9], [2,-10/9]])
-    sage: p_regular = p.restrict_to_regular_triangulations(True)        # optional - topcom
-    sage: regular = p_regular.triangulations_list()                     # optional - topcom
-    sage: p_nonregular = p.restrict_to_regular_triangulations(False)    # optional - topcom
-    sage: nonregular = p_nonregular.triangulations_list()               # optional - topcom
-    sage: len(regular)                                                  # optional - topcom
+    sage: p_regular = p.restrict_to_regular_triangulations(True)
+    sage: regular = p_regular.triangulations_list()
+    sage: p_nonregular = p.restrict_to_regular_triangulations(False)
+    sage: nonregular = p_nonregular.triangulations_list()
+    sage: len(regular)
     16
-    sage: len(nonregular)                                               # optional - topcom
+    sage: len(nonregular)
     2
-    sage: nonregular[0].plot(aspect_ratio=1, axes=False)                # optional - topcom, needs sage.plot
+    sage: nonregular[0].plot(aspect_ratio=1, axes=False)                                # needs sage.plot
     Graphics object consisting of 25 graphics primitives
     sage: PointConfiguration.set_engine('internal')   # to make doctests independent of TOPCOM
 
@@ -382,7 +382,7 @@ def set_engine(cls, engine='auto'):
             sage: p.triangulate()
             (<1,3,4>, <2,3,4>)
             sage: p.set_engine('topcom')
-            sage: p.triangulate()          # optional - topcom
+            sage: p.triangulate()
             (<0,1,2>, <0,1,4>, <0,2,4>, <1,2,3>)
             sage: p.set_engine('internal')
         """
@@ -743,9 +743,9 @@ def _TOPCOM_triangulate(self, verbose=True):
             sage: # optional - topcom
             sage: p = PointConfiguration([[0,0], [0,1], [1,0], [1,1], [-1,-1]])
             sage: p.set_engine('topcom')
-            sage: p._TOPCOM_triangulate(verbose=False)   # optional - topcom
+            sage: p._TOPCOM_triangulate(verbose=False)
             (<0,1,2>, <0,1,4>, <0,2,4>, <1,2,3>)
-            sage: list( p.triangulate() )                # optional - topcom
+            sage: list( p.triangulate() )
             [(0, 1, 2), (0, 1, 4), (0, 2, 4), (1, 2, 3)]
             sage: p.set_engine('internal')
         """

src/sage/geometry/voronoi_diagram.py

@@ -264,14 +264,14 @@ def plot(self, cell_colors=None, **kwds):
             sage: # needs sage.plot
             sage: P = [[0.671, 0.650], [0.258, 0.767], [0.562, 0.406],
             ....:      [0.254, 0.709], [0.493, 0.879]]
-            sage: V = VoronoiDiagram(P); S=V.plot()                                     # needs sage.plot
-            sage: show(S, xmin=0, xmax=1, ymin=0, ymax=1, aspect_ratio=1, axes=false)   # needs sage.plot
-            sage: S = V.plot(cell_colors={0: 'red', 1: 'blue', 2: 'green',                                 # needs sage.plot
+            sage: V = VoronoiDiagram(P); S=V.plot()
+            sage: show(S, xmin=0, xmax=1, ymin=0, ymax=1, aspect_ratio=1, axes=false)
+            sage: S = V.plot(cell_colors={0: 'red', 1: 'blue', 2: 'green',
             ....:                         3: 'white', 4: 'yellow'})
-            sage: show(S, xmin=0, xmax=1, ymin=0, ymax=1, aspect_ratio=1, axes=false)   # needs sage.plot
-            sage: S = V.plot(cell_colors=['red', 'blue', 'red', 'white', 'white'])           # needs sage.plot
-            sage: show(S, xmin=0, xmax=1, ymin=0, ymax=1, aspect_ratio=1, axes=false)   # needs sage.plot
-            sage: S = V.plot(cell_colors='something else')                                # needs sage.plot
+            sage: show(S, xmin=0, xmax=1, ymin=0, ymax=1, aspect_ratio=1, axes=false)
+            sage: S = V.plot(cell_colors=['red', 'blue', 'red', 'white', 'white'])
+            sage: show(S, xmin=0, xmax=1, ymin=0, ymax=1, aspect_ratio=1, axes=false)
+            sage: S = V.plot(cell_colors='something else')
             Traceback (most recent call last):
             ...
             AssertionError: 'cell_colors' must be a list or a dictionary