Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -17,3 +17,7 @@ MANIFEST
 *.orig
 .DS_Store
 *.so
+
+# IDE stuff
+.idea
+.vscode

README.md

@@ -9,7 +9,7 @@ DEAP includes the following features:
 
   * Genetic algorithm using any imaginable representation
     * List, Array, Set, Dictionary, Tree, Numpy Array, etc.
-  * Genetic programing using prefix trees
+  * Genetic programming using prefix trees
     * Loosely typed, Strongly typed
     * Automatically defined functions
   * Evolution strategies (including CMA-ES)
@@ -148,5 +148,6 @@ Authors of scientific papers including results generated using DEAP are encourag
   * DEAP is also used in ROS as an optimization package http://www.ros.org/wiki/deap.
   * DEAP is an optional dependency for [PyXRD](https://github.com/mathijs-dumon/PyXRD), a Python implementation of the matrix algorithm developed for the X-ray diffraction analysis of disordered lamellar structures.
   * DEAP is used in [glyph](https://github.com/Ambrosys/glyph), a library for symbolic regression with applications to [MLC](https://en.wikipedia.org/wiki/Machine_learning_control).
+  * DEAP is used in [Sklearn-genetic-opt](https://github.com/rodrigo-arenas/Sklearn-genetic-opt), an open source tool that uses evolutionary programming to fine tune machine learning hyperparameters.
 
 If you want your project listed here, send us a link and a brief description and we'll be glad to add it.

azure-pipelines.yml

@@ -11,8 +11,6 @@ jobs:
       vmImage: 'vs2017-win2016'
     strategy:
       matrix:
-        Python27_VS2017:
-          python.version: '2.7'
         Python36_VS2017:
           python.version: '3.6'
         Python37_VS2017:
@@ -21,15 +19,13 @@ jobs:
           python.version: '3.8'
         Python39_VS2017:
           python.version: '3.9'
+        Python310_VS2017:
+          python.version: '3.10'
     steps:
     - task: UsePythonVersion@0
       inputs:
         versionSpec: '$(python.version)'
       displayName: 'Use Python $(python.version)'
-    - script: |
-        choco install vcpython27 --yes
-      condition: eq(variables['python.version'], '2.7')
-      displayName: 'Install vcpython27'
     - script: |
         python -m pip install --upgrade pip
         pip install numpy
@@ -41,14 +37,12 @@ jobs:
         python setup.py sdist bdist_wheel
         twine upload -r pypi -u $(twineUsername) -p $(twinePassword) --skip-existing --disable-progress-bar dist/*
       displayName: 'Publish wheel to PyPi'
-  
+
   - job: macOS10_14Build
     pool:
       vmImage: 'macOS-10.14'
     strategy:
       matrix:
-        Python27_macOS1014:
-          python.version: '2.7'
         Python36_macOS1014:
           python.version: '3.6'
         Python37_macOS1014:
@@ -57,6 +51,8 @@ jobs:
           python.version: '3.8'
         Python39_macOS1014:
           python.version: '3.9'
+        Python310_macOS1014:
+          python.version: '3.10'
     steps:
     - task: UsePythonVersion@0
       inputs:
@@ -73,7 +69,7 @@ jobs:
         python setup.py sdist bdist_wheel
         twine upload -r pypi -u $(twineUsername) -p $(twinePassword) --skip-existing --disable-progress-bar dist/*
       displayName: 'Publish wheel to PyPi'
-  
+
   - job: Manylinux2010Build
     pool:
       vmImage: 'ubuntu-16.04'
@@ -117,6 +113,9 @@ jobs:
         Py39 Arm64:
           python.version: 'cp39-cp39'
           manylinux: 'manylinux_aarch64'
+        Py310 Arm64:
+          python.version: 'cp310-cp310'
+          manylinux: 'manylinux_aarch64'
     steps:
     - script: docker run --rm --privileged hypriot/qemu-register
       displayName: 'Registering qemu'

deap/algorithms.py

@@ -31,7 +31,7 @@
 
 
 def varAnd(population, toolbox, cxpb, mutpb):
-    """Part of an evolutionary algorithm applying only the variation part
+    r"""Part of an evolutionary algorithm applying only the variation part
     (crossover **and** mutation). The modified individuals have their
     fitness invalidated. The individuals are cloned so returned population is
     independent of the input population.
@@ -190,7 +190,7 @@ def eaSimple(population, toolbox, cxpb, mutpb, ngen, stats=None,
 
 
 def varOr(population, toolbox, lambda_, cxpb, mutpb):
-    """Part of an evolutionary algorithm applying only the variation part
+    r"""Part of an evolutionary algorithm applying only the variation part
     (crossover, mutation **or** reproduction). The modified individuals have
     their fitness invalidated. The individuals are cloned so returned
     population is independent of the input population.
@@ -247,7 +247,7 @@ def varOr(population, toolbox, lambda_, cxpb, mutpb):
 
 def eaMuPlusLambda(population, toolbox, mu, lambda_, cxpb, mutpb, ngen,
                    stats=None, halloffame=None, verbose=__debug__):
-    """This is the :math:`(\mu + \lambda)` evolutionary algorithm.
+    r"""This is the :math:`(\mu + \lambda)` evolutionary algorithm.
 
     :param population: A list of individuals.
     :param toolbox: A :class:`~deap.base.Toolbox` that contains the evolution
@@ -339,7 +339,7 @@ def eaMuPlusLambda(population, toolbox, mu, lambda_, cxpb, mutpb, ngen,
 
 def eaMuCommaLambda(population, toolbox, mu, lambda_, cxpb, mutpb, ngen,
                     stats=None, halloffame=None, verbose=__debug__):
-    """This is the :math:`(\mu~,~\lambda)` evolutionary algorithm.
+    r"""This is the :math:`(\mu~,~\lambda)` evolutionary algorithm.
 
     :param population: A list of individuals.
     :param toolbox: A :class:`~deap.base.Toolbox` that contains the evolution
@@ -470,7 +470,7 @@ def eaGenerateUpdate(toolbox, ngen, halloffame=None, stats=None,
 
     This function expects :meth:`toolbox.generate` and :meth:`toolbox.evaluate` aliases to be
     registered in the toolbox.
-    
+
     .. [Colette2010] Collette, Y., N. Hansen, G. Pujol, D. Salazar Aponte and
        R. Le Riche (2010). On Object-Oriented Programming of Optimizers -
        Examples in Scilab. In P. Breitkopf and R. F. Coelho, eds.: