Merge branch 'master' of github.com:DEAP/deap

intiMRA · Nov 12, 2017 · 9df0c9e · 9df0c9e
2 parents c358412 + cec5186
commit 9df0c9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/deap/tools/selection.py b/deap/tools/selection.py
@@ -49,8 +49,8 @@ def selWorst(individuals, k, fit_attr="fitness"):
 
 
 def selTournament(individuals, k, tournsize, fit_attr="fitness"):
-    """Select *k* individuals from the input *individuals* using *k*
-    tournaments of *tournsize* individuals. The list returned contains
+    """Select the best individual among *tournsize* randomly chosen
+    individuals, *k* times. The list returned contains
     references to the input *individuals*.
     
     :param individuals: A list of individuals to select from.

diff --git a/doc/examples/ga_onemax.rst b/doc/examples/ga_onemax.rst
@@ -53,7 +53,7 @@ We can't repeat it enough, in DEAP single objectives is a special case of
 multi objectives.
 
 Next we will create the class :class:`Individual`, which will inherit the
-class :class:`list` and contain the our previously defined :class:`FitnessMax`
+class :class:`list` and contain our previously defined :class:`FitnessMax`
 class in its *fitness* attribute. Note that upon creation all our defined
 classes will be part of the ``creator`` container and can be called directly.
 

diff --git a/doc/examples/index.rst b/doc/examples/index.rst
@@ -4,7 +4,7 @@ Examples
 This section contains some documented examples of common toy problems often
 encountered in the evolutionary computation community. Note that there are
 several other examples in the ``deap/examples`` sub-directory of the
-framework. These can be used has ground work for implementing your own flavour
+framework. These can be used as ground work for implementing your own flavour
 of evolutionary algorithms.