Merge pull request #1123 from Axelrod-Python/add-ability-to-pass-game-to-moran-process

Add ability to pass game to Moran process.

Author: meatballs

axelrod/moran.py

@@ -6,7 +6,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 
-from axelrod import DEFAULT_TURNS, Player
+from axelrod import DEFAULT_TURNS, Player, Game
 from .deterministic_cache import DeterministicCache
 from .graph import complete_graph, Graph
 from .match import Match
@@ -40,6 +40,7 @@ def fitness_proportionate_selection(scores: List) -> int:
 class MoranProcess(object):
     def __init__(self, players: List[Player], turns: int = DEFAULT_TURNS,
                  prob_end: float = None, noise: float = 0,
+                 game: Game = None,
                  deterministic_cache: DeterministicCache = None,
                  mutation_rate: float = 0., mode: str = 'bd',
                  interaction_graph: Graph = None,
@@ -94,6 +95,7 @@ def __init__(self, players: List[Player], turns: int = DEFAULT_TURNS,
         """
         self.turns = turns
         self.prob_end = prob_end
+        self.game = game
         self.noise = noise
         self.initial_players = players  # save initial population
         self.players = []  # type: List
@@ -322,6 +324,7 @@ def score_all(self) -> List:
             match = Match((player1, player2),
                           turns=self.turns, prob_end=self.prob_end,
                           noise=self.noise,
+                          game=self.game,
                           deterministic_cache=self.deterministic_cache)
             match.play()
             match_scores = match.final_score_per_turn()

axelrod/tests/unit/test_moran.py

@@ -22,6 +22,7 @@ def test_init(self):
         mp = MoranProcess(players)
         self.assertEqual(mp.turns, axelrod.DEFAULT_TURNS)
         self.assertIsNone(mp.prob_end)
+        self.assertIsNone(mp.game)
         self.assertEqual(mp.noise, 0)
         self.assertEqual(mp.initial_players, players)
         self.assertEqual(mp.players, list(players))
@@ -166,6 +167,15 @@ def test_two_prob_end(self):
         self.assertEqual(populations, mp.populations)
         self.assertEqual(mp.winning_strategy_name, str(p1))
 
+    def test_different_game(self):
+        # Possible for Cooperator to become fixed when using a different game
+        p1, p2 = axelrod.Cooperator(), axelrod.Defector()
+        axelrod.seed(0)
+        game = axelrod.Game(r=4, p=2, s=1, t=6)
+        mp = MoranProcess((p1, p2), turns=5, game=game)
+        populations = mp.play()
+        self.assertEqual(mp.winning_strategy_name, str(p1))
+
     def test_death_birth(self):
         """Two player death-birth should fixate after one round."""
         p1, p2 = axelrod.Cooperator(), axelrod.Defector()