sage.parallel, sage.sets: Update # needs

Author: Matthias Koeppe

src/sage/parallel/decorate.py

@@ -107,8 +107,8 @@ def __call__(self, f):
 
             sage: from sage.parallel.decorate import Parallel
             sage: p = Parallel()
-            sage: f = x^2 - 1                                                           # optional - sage.symbolic
-            sage: p(f)                                                                  # optional - sage.symbolic
+            sage: f = x^2 - 1                                                           # needs sage.symbolic
+            sage: p(f)                                                                  # needs sage.symbolic
             <sage.parallel.decorate.ParallelFunction object at ...>
 
             sage: P = sage.parallel.decorate.Parallel()
@@ -342,7 +342,7 @@ def parallel(p_iter='fork', ncpus=None, **kwds):
 
         sage: @parallel(ncpus=3, timeout=10)
         ....: def fac(n): return factor(2^n-1)
-        sage: for X, Y in sorted(list(fac([101,119,151,197,209]))): print((X,Y))        # optional - sage.libs.pari
+        sage: for X, Y in sorted(list(fac([101,119,151,197,209]))): print((X,Y))        # needs sage.libs.pari
         (((101,), {}), 7432339208719 * 341117531003194129)
         (((119,), {}), 127 * 239 * 20231 * 131071 * 62983048367 * 131105292137)
         (((151,), {}), 18121 * 55871 * 165799 * 2332951 * 7289088383388253664437433)
@@ -531,35 +531,36 @@ def fork(f=None, timeout=0, verbose=False):
     We illustrate that the state of the pexpect interface is not altered by
     forked functions (they get their own new pexpect interfaces!)::
 
-        sage: gp.eval('a = 5')                                                          # optional - sage.libs.pari
+        sage: # needs sage.libs.pari
+        sage: gp.eval('a = 5')
         '5'
-        sage: @fork()                                                                   # optional - sage.libs.pari
+        sage: @fork()
         ....: def g():
         ....:     gp.eval('a = 10')
         ....:     return gp.eval('a')
-        sage: g()                                                                       # optional - sage.libs.pari
+        sage: g()
         '10'
-        sage: gp.eval('a')                                                              # optional - sage.libs.pari
+        sage: gp.eval('a')
         '5'
 
     We illustrate that the forked function has its own pexpect
     interface::
 
-        sage: gp.eval('a = 15')                                                         # optional - sage.libs.pari
+        sage: gp.eval('a = 15')                                                         # needs sage.libs.pari
         '15'
-        sage: @fork()                                                                   # optional - sage.libs.pari
+        sage: @fork()
         ....: def g(): return gp.eval('a')
-        sage: g()                                                                       # optional - sage.libs.pari
+        sage: g()                                                                       # needs sage.libs.pari
         'a'
 
     We illustrate that segfaulting subprocesses are no trouble at all::
 
-        sage: cython('def f(): print(<char*>0)')                            # optional - sage.misc.cython
+        sage: cython('def f(): print(<char*>0)')                                        # needs sage.misc.cython
         sage: @fork
         ....: def g():
         ....:     os.environ["CYSIGNALS_CRASH_NDEBUG"]="yes" # skip enhanced backtrace (it is slow)
         ....:     f()
-        sage: print("this works"); g()                                      # optional - sage.misc.cython
+        sage: print("this works"); g()                                                  # needs sage.misc.cython
         this works...
         <BLANKLINE>
         ------------------------------------------------------------------------

src/sage/parallel/map_reduce.py

@@ -184,8 +184,8 @@
 
   Compare::
 
-      sage: from sage.combinat.q_analogues import q_factorial                           # optional - sage.combinat
-      sage: q_factorial(5)                                                              # optional - sage.combinat
+      sage: from sage.combinat.q_analogues import q_factorial                           # needs sage.combinat
+      sage: q_factorial(5)                                                              # needs sage.combinat
       q^10 + 4*q^9 + 9*q^8 + 15*q^7 + 20*q^6 + 22*q^5 + 20*q^4 + 15*q^3 + 9*q^2 + 4*q + 1
 
 * **Listing the objects.** One can also compute the list of objects in a
@@ -1653,14 +1653,14 @@ def steal(self):
             sage: EX = RESetMPExample(maxl=6)
             sage: EX.setup_workers(2)
 
+            sage: # known bug (Issue #27537)
             sage: w0, w1 = EX._workers
             sage: w0._todo.append(42)
             sage: thief0 = Thread(target = w0._thief, name="Thief")
-            sage: thief0.start()  # known bug (Issue #27537)
-
-            sage: w1.steal()  # known bug (Issue #27537)
+            sage: thief0.start()
+            sage: w1.steal()
             42
-            sage: w0._todo  # known bug (Issue #27537)
+            sage: w0._todo
             deque([])
         """
         self._mapred._signal_task_done()

src/sage/sets/recursively_enumerated_set.pyx

@@ -2088,13 +2088,20 @@ class RecursivelyEnumeratedSet_forest(Parent):
             sage: F = RecursivelyEnumeratedSet(seeds, succ,
             ....:                       structure='forest', enumeration='depth')
 
+            sage: # needs sage.symbolic
             sage: y = var('y')
             sage: def map_function(t):
             ....:     li, sum, _ = t
             ....:     return y ^ sum
-            sage: reduce_function = lambda x,y: x + y
+            sage: def reduce_function(x, y):
+            ....:     return x + y
             sage: F.map_reduce(map_function, reduce_function, 0)
-            y^45 + y^44 + y^43 + 2*y^42 + 2*y^41 + 3*y^40 + 4*y^39 + 5*y^38 + 6*y^37 + 8*y^36 + 9*y^35 + 10*y^34 + 12*y^33 + 13*y^32 + 15*y^31 + 17*y^30 + 18*y^29 + 19*y^28 + 21*y^27 + 21*y^26 + 22*y^25 + 23*y^24 + 23*y^23 + 23*y^22 + 23*y^21 + 22*y^20 + 21*y^19 + 21*y^18 + 19*y^17 + 18*y^16 + 17*y^15 + 15*y^14 + 13*y^13 + 12*y^12 + 10*y^11 + 9*y^10 + 8*y^9 + 6*y^8 + 5*y^7 + 4*y^6 + 3*y^5 + 2*y^4 + 2*y^3 + y^2 + y
+            y^45 + y^44 + y^43 + 2*y^42 + 2*y^41 + 3*y^40 + 4*y^39 + 5*y^38 + 6*y^37
+            + 8*y^36 + 9*y^35 + 10*y^34 + 12*y^33 + 13*y^32 + 15*y^31 + 17*y^30
+            + 18*y^29 + 19*y^28 + 21*y^27 + 21*y^26 + 22*y^25 + 23*y^24 + 23*y^23
+            + 23*y^22 + 23*y^21 + 22*y^20 + 21*y^19 + 21*y^18 + 19*y^17 + 18*y^16
+            + 17*y^15 + 15*y^14 + 13*y^13 + 12*y^12 + 10*y^11 + 9*y^10 + 8*y^9 + 6*y^8
+            + 5*y^7 + 4*y^6 + 3*y^5 + 2*y^4 + 2*y^3 + y^2 + y
 
         Here is an example with the default values::