Merge pull request #66 from Axelrod-Python/make-so-file-an-argument

Add ability to pass shared library name to Player

Author: meatballs

README.rst

@@ -33,23 +33,6 @@ Running a match:
    >>> match.play()
    [(C, C), (C, C), (C, D), (C, D), (C, C)]
 
-Running an instance of Axelrod's second tournament:
-
-.. code-block:: python
-
-   >>> import axelrod_fortran as axlf
-   >>> import axelrod as axl
-   >>> players = [axlf.Player(name) for name in axlf.second_tournament_strategies]
-   >>> print(len(players), "players")
-   63 players
-   >>> tournament = axl.Tournament(players, repetitions=1,
-   ...                             turns=63, match_attributes={"length": -1})
-   >>> results = tournament.play()
-   >>> results.write_summary('summary.csv')
-   >>> plot = axl.Plot(results)
-   >>> plot.save_all_plots("second_tournament")
-
-
 Contributing
 ============
 

src/axelrod_fortran/player.py

@@ -1,4 +1,5 @@
 import random
+import warnings
 
 import axelrod as axl
 from axelrod.interaction_utils import compute_final_score
@@ -7,7 +8,6 @@
 from .strategies import characteristics
 
 C, D = Action.C, Action.D
-strategies = cdll.LoadLibrary('libstrategies.so')
 actions = {0: C, 1: D}
 original_actions = {C: 0, D: 1}
 
@@ -16,7 +16,8 @@ class Player(axl.Player):
 
     classifier = {"stochastic": True}
 
-    def __init__(self, original_name):
+    def __init__(self, original_name,
+                 shared_library_name='libstrategies.so'):
         """
         Parameters
         ----------
@@ -27,6 +28,8 @@ def __init__(self, original_name):
             A instance of an axelrod Game
         """
         super().__init__()
+        self.shared_library_name = shared_library_name
+        self.shared_library = cdll.LoadLibrary(shared_library_name)
         self.original_name = original_name
         self.original_function = self.original_name
         is_stochastic = characteristics[self.original_name]['stochastic']
@@ -56,7 +59,7 @@ def original_function(self):
 
     @original_function.setter
     def original_function(self, value):
-        self.__original_function = strategies[(value + '_').lower()]
+        self.__original_function = self.shared_library[(value + '_').lower()]
         self.__original_function.argtypes = (
             POINTER(c_int), POINTER(c_int), POINTER(c_int), POINTER(c_int),
             POINTER(c_float))
@@ -72,6 +75,18 @@ def original_strategy(
         return self.original_function(*[byref(arg) for arg in args])
 
     def strategy(self, opponent):
+        if type(opponent) is Player \
+          and (opponent.original_name == self.original_name) \
+          and (opponent.shared_library_name == self.shared_library_name):
+
+            message = """
+You are playing a match with two copies of the same player.
+However the axelrod fortran players share memory.
+You can initialise an instance of an Axelrod_fortran player with a
+`shared_library_name`
+variable that points to a copy of the shared library."""
+            warnings.warn(message=message)
+
         if not self.history:
             their_last_move = 0
             scores = (0, 0)

tests/test_player.py

@@ -2,7 +2,7 @@
 from axelrod import (Alternator, Cooperator, Defector,
                      Match, Game, basic_strategies, seed)
 from axelrod.action import Action
-from ctypes import c_int, c_float, POINTER
+from ctypes import c_int, c_float, POINTER, CDLL
 
 import itertools
 import pytest
@@ -22,6 +22,15 @@ def test_init():
         assert player.original_function.restype == c_int
         with pytest.raises(ValueError):
             player = Player('test')
+        assert "libstrategies.so" == player.shared_library_name
+        assert type(player.shared_library) is CDLL
+        assert "libstrategies.so" in str(player.shared_library)
+
+def test_init_with_shared():
+    player = Player("k42r", shared_library_name="libstrategies.so")
+    assert "libstrategies.so" == player.shared_library_name
+    assert type(player.shared_library) is CDLL
+    assert "libstrategies.so" in str(player.shared_library)
 
 
 def test_matches():
@@ -145,3 +154,29 @@ def test_champion_v_alternator():
 
     seed(0)
     assert interactions == match.play()
+
+def test_warning_for_self_interaction(recwarn):
+    """
+    Test that a warning is given for a self interaction.
+    """
+    player = Player("k42r")
+    opponent = Player("k42r")
+
+    match = Match((player, opponent))
+
+    interactions = match.play()
+    assert len(recwarn) == 1
+
+def test_no_warning_for_normal_interaction(recwarn):
+    """
+    Test that a warning is not given for a normal interaction
+    """
+    player = Player("k42r")
+    opponent = Alternator()
+    for players in [(Player("k42r"), Alternator()),
+                    (Player("k42r"), Player("k41r"))]:
+
+        match = Match(players)
+
+        interactions = match.play()
+        assert len(recwarn) == 0