Merge branch 'add-custom-matches' of github.com:Axelrod-Python/Axelrod into add-custom-matches

Author: drvinceknight

axelrod/tests/unit/test_moran.py

@@ -193,9 +193,9 @@ def test_different_game(self):
         self.assertEqual(mp.winning_strategy_name, str(p1))
 
     def test_different_match(self):
-        # Using a different game where the scores are all the same
-        # This is a test to mainly show that the results are different to the
-        # results of `test_different_game` where the same seed is used.
+        """Test alternative Match class, mainly to show that the results are different
+        than the results of `test_different_game` where the same seed is used."""
+        # Using a different game where the scores are all constant
         class StandInMatch(axl.Match):
             """A Match were all players get a score of 3"""
 

docs/how-to/use_custom_matches.rst

@@ -3,7 +3,7 @@
 Use custom matches
 ==================
 
-At present it is possible to use a custom match class in a Moran process. Below
+The Moran process supports custom match classes. Below
 creates a new class of a match where both players end with a score of 2::
 
 
@@ -13,8 +13,8 @@ creates a new class of a match where both players end with a score of 2::
     ...     def final_score_per_turn(self):
     ...         return 2, 2
 
-We can now create a Moran process like we normally would and pass our custom
-:code:`MassBaseMatch` to the moran process with the :code:`match_class` keyword
+We then create a Moran process with the custom match class by passing our custom
+:code:`MassBaseMatch` to the Moran process with the :code:`match_class` keyword
 argument::
 
     >>> players = [axl.Cooperator(), axl.Defector(), axl.TitForTat(), axl.Grudger()]

docs/tutorials/creating_heterogenous_player_moran_process/index.rst

@@ -1,6 +1,6 @@
 .. _create-heterogeneous-moran-processes:
 
-Create heterogeneous Moran Processes
+Create Heterogeneous Moran Processes
 ====================================
 
 Axelrod Matches are homogeneous by nature but can be extended to utilize
@@ -16,7 +16,7 @@ This is equivalent in principle to the country masses discussed in
 
     >>> import axelrod as axl
     >>> players = [player() for player in axl.demo_strategies]
-    >>> masses = [1 * i for i in range(len(players))]
+    >>> masses = [i for i in range(len(players))]
     >>> players
     [Cooperator, Defector, Tit For Tat, Grudger, Random: 0.5]
 
@@ -60,6 +60,6 @@ process that keeps the mass of the individuals constant::
     Random: 0.5
 
 Note that the snippets here only influence the final score of matches. The
-behavior of matches,  and moran processes can be more heavily influenced by
+behavior of matches, and Moran processes can be more heavily influenced by
 partially overwriting other :code:`match` functions or :code:`birth` and
 :code:`death` functions within :code:`MoranProcess`.