Skip to content

Commit 9b067a1

Browse files
committed
Change name of transformer to MixedTransformer.
1 parent 5d83b63 commit 9b067a1

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

axelrod/strategy_transformers.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,12 @@ def apology_wrapper(player, opponent, action, myseq, opseq):
241241
name_prefix="Apologizing")
242242

243243

244-
def mutate_wrapper(player, opponent, action, probability, m_player):
244+
def mixed_wrapper(player, opponent, action, probability, m_player):
245245
"""Randomly picks a strategy to play, either from a distribution on a list
246-
of players or a single player."""
246+
of players or a single player.
247+
248+
In essence creating a mixed strategy.
249+
"""
247250

248251
# If a single probability, player is passed
249252
if type(probability) in [float, int]:
@@ -264,7 +267,7 @@ def mutate_wrapper(player, opponent, action, probability, m_player):
264267

265268
return action
266269

267-
MutateTransformer = StrategyTransformerFactory(mutate_wrapper, name_prefix="Mutated")
270+
MixedTransformer = StrategyTransformerFactory(mixed_wrapper, name_prefix="Mutated")
268271

269272
# Strategy wrappers as classes
270273

axelrod/tests/unit/test_strategy_transformers.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ def test_apology(self):
213213
self.assertEqual(p1.history, [D, D, C, D, D, C])
214214

215215
def test_mutate(self):
216-
"""Tests the MutateTransformer."""
216+
"""Tests the MixedTransformer."""
217217
probability = 1
218-
MD = MutateTransformer(probability, axelrod.Cooperator)(axelrod.Defector)
218+
MD = MixedTransformer(probability, axelrod.Cooperator)(axelrod.Defector)
219219

220220
p1 = MD()
221221
p2 = axelrod.Cooperator()
@@ -224,7 +224,7 @@ def test_mutate(self):
224224
self.assertEqual(p1.history, [C, C, C, C, C])
225225

226226
probability = 0
227-
MD = MutateTransformer(probability, axelrod.Cooperator)(axelrod.Defector)
227+
MD = MixedTransformer(probability, axelrod.Cooperator)(axelrod.Defector)
228228

229229
p1 = MD()
230230
p2 = axelrod.Cooperator()
@@ -238,7 +238,7 @@ def test_mutate(self):
238238
# 'nice'
239239
probability = [.3, .2, 0]
240240
strategies = [axelrod.TitForTat, axelrod.Grudger, axelrod.Defector]
241-
MD = MutateTransformer(probability, strategies)(axelrod.Cooperator)
241+
MD = MixedTransformer(probability, strategies)(axelrod.Cooperator)
242242

243243
p1 = MD()
244244
# Against a cooperator we see that we only cooperate
@@ -250,7 +250,7 @@ def test_mutate(self):
250250
# Decorate a cooperator putting all weight on Defector
251251
probability = [0, 0, 1]
252252
strategies = [axelrod.TitForTat, axelrod.Grudger, axelrod.Defector]
253-
MD = MutateTransformer(probability, strategies)(axelrod.Cooperator)
253+
MD = MixedTransformer(probability, strategies)(axelrod.Cooperator)
254254

255255
p1 = MD()
256256
# Against a cooperator we see that we only cooperate

docs/tutorials/advanced/strategy_transformers.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,22 +132,22 @@ after two consequtive rounds of `(D, C)`::
132132
>>> from axelrod.strategy_transformers import TrackHistoryTransformer
133133
>>> player = TrackHistoryTransformer(axelrod.Random)()
134134

135-
* :code:`MutateTransformer`: Randomly plays a mutation to another strategy (or
135+
* :code:`MixedTransformer`: Randomly plays a mutation to another strategy (or
136136
set of strategies. Here is the syntax to do this with a set of strategies::
137137

138138
>>> import axelrod
139-
>>> from axelrod.strategy_transformers import MutateTransformer
139+
>>> from axelrod.strategy_transformers import MixedTransformer
140140
>>> strategies = [axelrod.Grudger, axelrod.TitForTat]
141141
>>> probability = [.2, .3] # .5 chance of mutated to one of above
142-
>>> player = MutateTransformer(probability, strategies)(axelrod.Cooperator)
142+
>>> player = MixedTransformer(probability, strategies)(axelrod.Cooperator)
143143

144144
Here is the syntax when passing a single strategy::
145145

146146
>>> import axelrod
147-
>>> from axelrod.strategy_transformers import MutateTransformer
147+
>>> from axelrod.strategy_transformers import MixedTransformer
148148
>>> strategy = axelrod.Grudger
149149
>>> probability = .2
150-
>>> player = MutateTransformer(probability, strategy)(axelrod.Cooperator)
150+
>>> player = MixedTransformer(probability, strategy)(axelrod.Cooperator)
151151

152152

153153
Composing Transformers

0 commit comments

Comments
 (0)