Merge pull request #12 from Axelrod-Python/marc

Fix stochastic behavior and refactor tests to use unittest

Author: meatballs

src/axelrod_fortran/player.py

@@ -1,3 +1,5 @@
+import random
+
 import axelrod as axl
 from axelrod.interaction_utils import compute_final_score
 from axelrod.action import Action
@@ -57,15 +59,15 @@ def original_function(self, value):
         self.__original_function.restype = c_int
 
     def original_strategy(
-        self, their_last_move, move_number, my_score, their_score, noise,
+        self, their_last_move, move_number, my_score, their_score, random_value,
         my_last_move
     ):
         args = (
             c_int(their_last_move), c_int(move_number), c_int(my_score),
-            c_int(their_score), c_float(noise), c_int(my_last_move))
+            c_int(their_score), c_float(random_value), c_int(my_last_move))
         return self.original_function(*[byref(arg) for arg in args])
 
-    def strategy(self, opponent, noise=0):
+    def strategy(self, opponent):
         if not self.history:
             their_last_move = 0
             scores = (0, 0)
@@ -76,8 +78,9 @@ def strategy(self, opponent, noise=0):
                                          game=self.game)
             my_last_move = original_actions[self.history[-1]]
         move_number = len(self.history) + 1
+        random_value = random.random()
         original_action = self.original_strategy(
-            their_last_move, move_number, scores[0], scores[1], noise,
+            their_last_move, move_number, scores[0], scores[1], random_value,
             my_last_move)
         return actions[original_action]
 

tests/test_player.py

@@ -29,6 +29,7 @@ def test_matches():
                 action in (C, D) for interaction in match.play()
                 for action in interaction)
 
+
 def test_noisy_matches():
     for strategy in all_strategies:
         for opponent in (Alternator, Cooperator, Defector):
@@ -38,6 +39,7 @@ def test_noisy_matches():
                 action in (C, D) for interaction in match.play()
                 for action in interaction)
 
+
 def test_probend_matches():
     for strategy in all_strategies:
         for opponent in (Alternator, Cooperator, Defector):
@@ -47,10 +49,11 @@ 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)
+            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(
@@ -80,7 +83,7 @@ def test_original_strategy():
                     move_number=move_number,
                     my_score=my_score,
                     their_score=their_score,
-                    noise=0,
+                    random_value=0,
                     my_last_move=my_action)
 
                 assert my_action in [0, 1]