Changing name to MetaMixer.

Author: drvinceknight

axelrod/strategies/__init__.py

@@ -9,13 +9,13 @@
     MetaPlayer, MetaMajority, MetaMinority, MetaWinner, MetaHunter,
     MetaMajorityMemoryOne, MetaWinnerMemoryOne, MetaMajorityFiniteMemory,
     MetaWinnerFiniteMemory, MetaMajorityLongMemory, MetaWinnerLongMemory,
-    MetaMutater
+    MetaMixer
     )
 
 strategies.extend((MetaHunter, MetaMajority, MetaMinority, MetaWinner,
                    MetaMajorityMemoryOne, MetaWinnerMemoryOne,
                    MetaMajorityFiniteMemory, MetaWinnerFiniteMemory,
-                   MetaMajorityLongMemory, MetaWinnerLongMemory, MetaMutater))
+                   MetaMajorityLongMemory, MetaWinnerLongMemory, MetaMixer))
 
 # Distinguished strategy collections in addition to
 # `strategies` from _strategies.py

axelrod/strategies/meta.py

@@ -269,11 +269,13 @@ def __init__(self):
         self.init_args = ()
 
 
-class MetaMutater(MetaPlayer):
-    """A player who randomly switch between a team of players.
+class MetaMixer(MetaPlayer):
+    """A player who randomly switches between a team of players.
     If no distribution is passed then the player will uniformly choose between
     sub players.
 
+    In essence this is creating a Mixed strategy.
+
     Parameters
     ----------
     team : list of strategy classes, optional
@@ -284,7 +286,7 @@ class MetaMutater(MetaPlayer):
         If none is passed will select uniformly.
     """
 
-    name = "Meta Mutater"
+    name = "Meta Mixer"
 
     def __init__(self, team=None, distribution=None):
 
@@ -298,7 +300,7 @@ def __init__(self, team=None, distribution=None):
 
         self.distribution = distribution
 
-        super(MetaMutater, self).__init__()
+        super(MetaMixer, self).__init__()
         self.init_args = (team, distribution)
 
     def meta_strategy(self, results, opponent):

axelrod/tests/unit/test_meta.py

@@ -286,10 +286,10 @@ def test_strategy(self):
         self.first_play_test(C)
 
 
-class TestMetaMutater(TestMetaPlayer):
+class TestMetaMixer(TestMetaPlayer):
 
-    name = "Meta Mutater"
-    player = axelrod.MetaMutater
+    name = "Meta Mixer"
+    player = axelrod.MetaMixer
     expected_classifier = {
         'memory_depth': float('inf'),  # Long memory
         'stochastic': True,
@@ -303,7 +303,7 @@ def test_strategy(self):
         team = [axelrod.TitForTat, axelrod.Cooperator, axelrod.Grudger]
         distribution = [.2, .5, .3]
 
-        P1 = axelrod.MetaMutater(team, distribution)
+        P1 = axelrod.MetaMixer(team, distribution)
         P2 = axelrod.Cooperator()
 
         for k in range(100):
@@ -312,14 +312,14 @@ def test_strategy(self):
         team.append(axelrod.Defector)
         distribution = [.2, .5, .3, 0]  # If add a defector but does not occur
 
-        P1 = axelrod.MetaMutater(team, distribution)
+        P1 = axelrod.MetaMixer(team, distribution)
 
         for k in range(100):
             self.assertEqual(P1.strategy(P2), C)
 
         distribution = [0, 0, 0, 1]  # If defector is only one that is played
 
-        P1 = axelrod.MetaMutater(team, distribution)
+        P1 = axelrod.MetaMixer(team, distribution)
 
         for k in range(100):
             self.assertEqual(P1.strategy(P2), D)
@@ -328,7 +328,7 @@ def test_raise_error_in_distribution(self):
         team = [axelrod.TitForTat, axelrod.Cooperator, axelrod.Grudger]
         distribution = [.2, .5, .5]  # Not a valid probability distribution
 
-        P1 = axelrod.MetaMutater(team, distribution)
+        P1 = axelrod.MetaMixer(team, distribution)
         P2 = axelrod.Cooperator()
 
         self.assertRaises(ValueError, P1.strategy, P2)