Merge pull request #5 from Axelrod-Python/add-abilitity-to-play-with-different-game

Add abilitity to play with different game

Author: meatballs

src/axelrod_fortran/player.py

@@ -1,6 +1,7 @@
 import axelrod.player as axl
 from axelrod.interaction_utils import compute_final_score
 from axelrod.action import Action
+from axelrod import Game
 from ctypes import cdll, c_int, c_float, byref, POINTER
 
 C, D = Action.C, Action.D
@@ -11,17 +12,20 @@
 
 class Player(axl.Player):
 
-    def __init__(self, original_name):
+    def __init__(self, original_name, game=Game()):
         """
         Parameters
         ----------
         original_name: str
             The name of the fortran function from the original axelrod
             tournament
+        game: axelrod.Game
+            A instance of an axelrod Game
         """
         super().__init__()
         self.original_name = original_name
         self.original_function = self.original_name
+        self.game = game
 
     def __enter__(self):
         return self
@@ -66,7 +70,8 @@ def strategy(self, opponent, noise=0):
             my_last_move = 0
         else:
             their_last_move = original_actions[opponent.history[-1]]
-            scores = compute_final_score(zip(self.history, opponent.history))
+            scores = compute_final_score(zip(self.history, opponent.history),
+                                         game=self.game)
             my_last_move = original_actions[self.history[-1]]
         move_number = len(self.history) + 1
         original_action = self.original_strategy(

tests/test_player.py

@@ -1,6 +1,6 @@
 from axelrod_fortran.strategies import all_strategies
 from axelrod_fortran.player import Player
-from axelrod import Alternator, Cooperator, Defector, Match
+from axelrod import Alternator, Cooperator, Defector, Match, Game
 from axelrod.action import Action
 from ctypes import c_int, c_float, POINTER
 
@@ -46,6 +46,17 @@ def test_probend_matches():
                 action in (C, D) for interaction in match.play()
                 for action in interaction)
 
+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())
+            match = Match(players, turns=200, game=game)
+            assert all(
+                action in (C, D) for interaction in match.play()
+                for action in interaction)
+
+
 def test_original_strategy():
     """
     Test original strategy against all possible first 5 moves of a Match