New changes

Author: MariosZoulias

axelrod/strategies/_strategies.py

@@ -6,7 +6,7 @@
 from .averagecopier import AverageCopier, NiceAverageCopier
 from .axelrod_first import (
     Davis, RevisedDowning, Feld, Grofman, Nydegger, Joss, Shubik, Tullock,
-    UnnamedStrategy)
+    UnnamedStrategy, SteinAndRapoport)
 from .axelrod_second import Champion, Eatherley, Tester
 from .backstabber import BackStabber, DoubleCrosser
 from .better_and_better import BetterAndBetter
@@ -72,7 +72,6 @@
 from .selfsteem import SelfSteem
 from .shortmem import ShortMem
 from .stalker import Stalker
-from .axelrod_first import SteinAndRapoport
 from .titfortat import (
     TitForTat, TitFor2Tats, TwoTitsForTat, Bully, SneakyTitForTat,
     SuspiciousTitForTat, AntiTitForTat, HardTitForTat, HardTitFor2Tats,

axelrod/strategies/axelrod_first.py

@@ -492,15 +492,18 @@ def strategy(opponent: Player) -> Action:
 
 @FinalTransformer((D, D), name_prefix=None)
 class SteinAndRapoport(Player):
-    """
-        A player who plays according to statistic methods.
-        Begins by playing C for the first four (4) rounds , then it plays
-        tit for tat and at the last 2 round it Defects. Every 15 turns it
-        run a chi-squared test to check whether the opponent behaves randomly
-        or not . In case the opponent behaves randomly then Stein_and_Rapoport
-        Defects untill the next 15 round (where we check again), otherwise he
-        still plays TitForTat.
-    """
+"""
+A player who plays according to statistic methods.
+Begins by playing C for the first four (4) rounds , then it plays
+tit for tat and at the last 2 round it Defects. Every 15 turns it
+run a chi-squared test to check whether the opponent behaves randomly
+or not . In case the opponent behaves randomly then Stein_and_Rapoport
+Defects untill the next 15 round (where we check again), otherwise he
+still plays TitForTat.
+
+Names:
+- SteinAndRapoport [Axelrod1980]_
+"""
 
     name = 'Stein and Rapoport'
     classifier = {
@@ -527,31 +530,30 @@ def __init__(self, alpha: float=0.05) -> None:
             self.alpha = 0.05
 
     def strategy(self , opponent: Player , chi_tests = [0]) -> Action:
-        # chi-tests == 0 then we play TitForTat
         round_number = len(self.history) + 1
 
         # First 4 moves
-        if round_number < 5 :
+        if round_number < 5:
             return C
 
         # For first 15 rounds tit for tat as we dont know opponents strategy
-        if round_number < 16 :
-            if opponent.history[-1] == 'D' :
+        if round_number < 16:
+            if opponent.history[-1] == 'D':
                 return D
             else :
                 return C
 
-        if len(self.history) % 15 == 0 :
-            if chisquare([opponent.cooperations, opponent.defections]).pvalue >= self.alpha :
+        if len(self.history) % 15 == 0:
+            if chisquare([opponent.cooperations, opponent.defections]).pvalue >= self.alpha:
                 chi_tests.append(1)
-            else :
+            else:
                 chi_tests.append(0)
 
-        if chi_tests[-1] == 1 :
+        if chi_tests[-1] == 1:
             # Defect if opponent plays randomly
             return D
         else : # TitForTatat if opponent plays not randomly
-            if opponent.history[-1] == 'D' :
+            if opponent.history[-1] == 'D':
                 return D
-            else :
+            else:
                 return C

requirements.txt

@@ -3,3 +3,4 @@ matplotlib>=1.4.2
 hypothesis>=3.2
 tqdm>=3.4.0
 prompt-toolkit>=1.0.7
+scipy>=0.19.0