Merge pull request #27 from Axelrod-Python/better-game-assignment

Change how the game is read in by the player.

Author: meatballs

src/axelrod_fortran/player.py

@@ -17,7 +17,7 @@ class Player(axl.Player):
 
     classifier = {"stochastic": True}
 
-    def __init__(self, original_name, game=Game()):
+    def __init__(self, original_name):
         """
         Parameters
         ----------
@@ -30,7 +30,6 @@ def __init__(self, original_name, game=Game()):
         super().__init__()
         self.original_name = original_name
         self.original_function = self.original_name
-        self.game = game
         is_stochastic = characteristics[self.original_name]['stochastic']
         if is_stochastic is not None:
             self.classifier['stochastic'] = is_stochastic
@@ -79,7 +78,7 @@ def strategy(self, opponent):
         else:
             their_last_move = original_actions[opponent.history[-1]]
             scores = compute_final_score(zip(self.history, opponent.history),
-                                         game=self.game)
+                                         game=self.match_attributes["game"])
             my_last_move = original_actions[self.history[-1]]
         move_number = len(self.history) + 1
         random_value = random.random()

tests/test_player.py

@@ -56,7 +56,7 @@ def test_matches_with_different_game():
     for strategy in all_strategies:
         for opponent in (Alternator, Cooperator, Defector):
             game = Game(r=4, s=0, p=2, t=6)
-            players = (Player(strategy, game=game), opponent())
+            players = (Player(strategy), opponent())
             match = Match(players, turns=200, game=game)
             assert all(
                 action in (C, D) for interaction in match.play()