diff --git a/axelrod/match.py b/axelrod/match.py index 3897b57f9..623e54ee2 100644 --- a/axelrod/match.py +++ b/axelrod/match.py @@ -10,10 +10,7 @@ def is_stochastic(players, noise): """Determines if a match is stochastic -- true if there is noise or if any of the players involved is stochastic.""" - return ( - self._noise or - any(p.classifier['stochastic'] for p in self.players) - ) + return (noise or any(p.classifier['stochastic'] for p in players)) class Match(object): diff --git a/docs/tutorials/getting_started/moran.rst b/docs/tutorials/getting_started/moran.rst index 40b7e5f1b..bdaaf85d4 100644 --- a/docs/tutorials/getting_started/moran.rst +++ b/docs/tutorials/getting_started/moran.rst @@ -26,7 +26,7 @@ the library, proceed as follows:: ... axl.TitForTat(), axl.Grudger()] >>> mp = axl.MoranProcess(players) >>> mp.play() - >>> mp.winner # doctest: +SKIP + >>> mp.winning_strategy_name # doctest: +SKIP Defector @@ -48,8 +48,8 @@ The sequence of populations:: The scores in each round:: - >>> import pprint - >>> pprint.pprint(mp.score_history) # doctest: +SKIP + >>> for row in mp.score_history: # doctest: +SKIP + ... print([round(element, 1) for element in row]) [[6.0, 7.0800000000000001, 6.9900000000000002, 6.9900000000000002], [6.0, 7.0800000000000001, 6.9900000000000002, 6.9900000000000002], [3.0, 7.04, 7.04, 4.9800000000000004],