Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history 
--HG--
branch : dev
  • Loading branch information
@mgard
mgard authored and marc.andre.gardner committed Jun 14, 2012
2 parents cce0378 + 6b2bddd commit 47a6415
Showing 1 changed file with 24 additions and 21 deletions.
45 changes: 24 additions & 21 deletions doc/api/tools.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fitness is left to the user and is generally fulfilled in the algorithms by
calling :func:`toolbox.clone` on an individual to duplicate it and ``del`` on
the :attr:`values` attribute of the individual's fitness to invalidate it.

Here is a list of the implemented operators in DEAP.
Here is a list of the implemented operators in DEAP,

============================ =========================================== ========================================= ========================= ================
Initialization Crossover Mutation Selection Migration
Expand All @@ -23,18 +23,27 @@ Here is a list of the implemented operators in DEAP.
:func:`~deap.gp.genFull` :func:`cxPartialyMatched` :func:`mutPolynomialBounded` :func:`selSPEA2` ..
:func:`~deap.gp.genGrow` :func:`cxUniformPartialyMatched` :func:`mutUniformInt` :func:`selRandom` ..
:func:`~deap.gp.genRamped` :func:`cxOrdered` :func:`mutESLogNormal` :func:`selBest` ..
.. :func:`cxBlend` :func:`~deap.gp.mutUniform` :func:`selWorst` ..
.. :func:`cxESBlend` :func:`~deap.gp.mutTypedUniform` :func:`selTournamentDCD` ..
.. :func:`cxESTwoPoints` :func:`~deap.gp.mutTypedNodeReplacement` .. ..
.. :func:`cxSimulatedBinary` :func:`~deap.gp.mutTypedEphemeral` .. ..
.. :func:`cxSimulatedBinaryBounded` :func:`~deap.gp.mutShrink` .. ..
.. :func:`cxMessyOnePoint` :func:`~deap.gp.mutTypedInsert` .. ..
.. :func:`~deap.gp.cxUniformOnePoint` .. .. ..
.. :func:`~deap.gp.cxTypedOnePoint` .. .. ..
.. :func:`~deap.gp.cxOnePointLeafBiased` .. .. ..
.. :func:`~deap.gp.cxTypedOnePointLeafBiased` .. .. ..
.. :func:`cxBlend` .. :func:`selWorst` ..
.. :func:`cxESBlend` .. :func:`selTournamentDCD` ..
.. :func:`cxESTwoPoints` .. .. ..
.. :func:`cxSimulatedBinary` .. .. ..
.. :func:`cxSimulatedBinaryBounded` .. .. ..
.. :func:`cxMessyOnePoint` .. .. ..
============================ =========================================== ========================================= ========================= ================

and genetic programming specific operators.

=========================================== =========================================
Crossover Mutation
=========================================== =========================================
:func:`~deap.gp.cxOnePoint` :func:`~deap.gp.mutUniform`
:func:`~deap.gp.cxOnePointLeafBiased` :func:`~deap.gp.mutNodeReplacement`
.. :func:`~deap.gp.mutEphemeral`
.. :func:`~deap.gp.mutShrink`
.. :func:`~deap.gp.mutInsert`
=========================================== =========================================


Initialization
++++++++++++++

Expand Down Expand Up @@ -77,14 +86,10 @@ Crossover

.. autofunction:: deap.tools.cxMessyOnePoint

.. autofunction:: deap.gp.cxUniformOnePoint

.. autofunction:: deap.gp.cxTypedOnePoint
.. autofunction:: deap.gp.cxOnePoint

.. autofunction:: deap.gp.cxOnePointLeafBiased

.. autofunction:: deap.gp.cxTypedOnePointLeafBiased

Mutation
++++++++

Expand All @@ -102,15 +107,13 @@ Mutation

.. autofunction:: deap.gp.mutUniform

.. autofunction:: deap.gp.mutTypedUniform

.. autofunction:: deap.gp.mutTypedNodeReplacement
.. autofunction:: deap.gp.mutNodeReplacement

.. autofunction:: deap.gp.mutTypedEphemeral
.. autofunction:: deap.gp.mutEphemeral

.. autofunction:: deap.gp.mutShrink

.. autofunction:: deap.gp.mutTypedInsert
.. autofunction:: deap.gp.mutInsert

Selection
+++++++++
Expand Down

0 comments on commit 47a6415

Please sign in to comment.