Moved map/reduce to sage/parallel

sagemath · Dec 14, 2015 · 2534f12 · 2534f12
1 parent 493bb52
commit 2534f12
Show file tree

Hide file tree

Showing 8 changed files with 72 additions and 70 deletions.
diff --git a/src/doc/en/reference/combinat/module_list.rst b/src/doc/en/reference/combinat/module_list.rst
@@ -127,7 +127,6 @@ Comprehensive Module list
     sage/combinat/kazhdan_lusztig
     sage/combinat/knutson_tao_puzzles
     sage/combinat/lyndon_word
-    sage/combinat/map_reduce
     sage/combinat/matrices/__init__
     sage/combinat/matrices/all
     sage/combinat/matrices/dancing_links

diff --git a/src/doc/en/reference/parallel/index.rst b/src/doc/en/reference/parallel/index.rst
@@ -7,6 +7,7 @@ Parallel Computing
    sage/parallel/decorate
    sage/parallel/reference
    sage/parallel/use_fork
+   sage/parallel/map_reduce
    sage/parallel/multiprocessing_sage
    sage/parallel/ncpus
 

diff --git a/...erence/combinat/media/map_reduce_arch.fig → ...erence/parallel/media/map_reduce_arch.fig b/...erence/combinat/media/map_reduce_arch.fig → ...erence/parallel/media/map_reduce_arch.fig
diff --git a/...erence/combinat/media/map_reduce_arch.pdf → ...erence/parallel/media/map_reduce_arch.pdf b/...erence/combinat/media/map_reduce_arch.pdf → ...erence/parallel/media/map_reduce_arch.pdf
diff --git a/...erence/combinat/media/map_reduce_arch.png → ...erence/parallel/media/map_reduce_arch.png b/...erence/combinat/media/map_reduce_arch.png → ...erence/parallel/media/map_reduce_arch.png
diff --git a/src/sage/combinat/backtrack.py b/src/sage/combinat/backtrack.py
@@ -735,9 +735,11 @@ def map_reduce(self, map_function = None,
             sage: F.map_reduce(
             ...    lambda (li, sum, _): y**sum, lambda x,y: x + y,  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
+
+        .. SEEALSO:: :mod:`sage.parallel.map_reduce`
         """
-        import sage.combinat.map_reduce
-        return sage.combinat.map_reduce.RESetMapReduce(
+        import sage.parallel.map_reduce
+        return sage.parallel.map_reduce.RESetMapReduce(
             forest = self,
             map_function = map_function,
             reduce_function = reduce_function,

diff --git a/src/sage/combinat/enumerated_sets.py b/src/sage/combinat/enumerated_sets.py
@@ -119,7 +119,7 @@
 
 - :func:`~sage.sets.recursively_enumerated_set.RecursivelyEnumeratedSet`
 - :class:`~sage.combinat.backtrack.GenericBacktracker`
-- :ref:`sage.combinat.map_reduce`
+- :ref:`sage.parallel.map_reduce`
 - :ref:`sage.combinat.tiling`
 - :ref:`sage.combinat.dlx`
 - :ref:`sage.combinat.matrices.dlxcpp`