Fixed formatting issues mentioned in PR

Author: gaffney2010

axelrod/strategies/axelrod_second.py

@@ -755,9 +755,9 @@ def strategy(self, opponent: Player) -> Action:
         turn = len(self.history) + 1
         if turn == 1: return C
 
-        did_d = np.vectorize(lambda action: float(action == D))
-        number_defects = np.sum(did_d(opponent.history))
-        perc_defects = number_defects / turn # Size of numerator is smaller than denomator -- How it was in the Fortran.
+        number_defects = opponent.defections
+        # Size of numerator is smaller than denomator -- How it was in the Fortran.
+        perc_defects = number_defects / turn
 
         # If overly defect or appears random
         if turn > 39 and perc_defects > 0.39: return D
@@ -774,12 +774,12 @@ def strategy(self, opponent: Player) -> Action:
 
 class WmAdams(Player):
     """
-    Strategy submitted to Axelrod's second tournament by William Adams (K49R),
+    Strategy submitted to Axelrod's second tournament by William Adams (K44R),
     and came in fifth in that tournament.
 
-    Count the number of opponent defects after their first move, call 
+    Count the number of opponent defections after their first move, call 
     `c_defect`.  Defect if c_defect equals 4, 7, or 9.  If c_defect > 9,
-    then defect immediately after opponent defect with probability = 
+    then defect immediately after opponent defects with probability = 
     (0.5)^(c_defect-1).  Otherwise cooperate.
 
     Names:
@@ -799,12 +799,11 @@ class WmAdams(Player):
     }
 
     def strategy(self, opponent: Player) -> Action:
-        if len(self.history) <=1:
+        if len(self.history) <= 1:
             return C
-        did_d = np.vectorize(lambda action: float(action == D))
-        number_defects = np.sum(did_d(opponent.history[1:]))
+        number_defects = opponent.defections
 
-        if number_defects == 4 or number_defects == 7 or number_defects == 9: return D
+        if number_defects in [4, 7, 9]: return D
         if number_defects > 9 and opponent.history[-1] == D:
-            return random_choice((0.5)**(number_defects-9))
+            return random_choice((0.5) ** (number_defects - 9))
         return C

axelrod/tests/strategies/test_axelrod_second.py

@@ -563,14 +563,19 @@ def test_strategy(self):
         actions = [(C, D)] * 4 + [(C, C)] * 100
         self.versus_test(defect_four, expected_actions=actions)
 
-        actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D), (C, D), (D, D), (C, D), (D, D), (C, D), (D, D), (D, D), (D, D), (D, D)]
+        actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D),
+                    (C, D), (D, D), (C, D), (D, D), (C, D), (D, D), (D, D),
+                    (D, D), (D, D)]
         self.versus_test(axelrod.Defector(), expected_actions=actions, seed=1)
-        actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D), (C, D), (D, D), (C, D), (D, D), (D, D), (D, D), (C, D), (D, D), (D, D)]
+        actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D),
+                    (C, D), (D, D), (C, D), (D, D), (D, D), (D, D), (C, D),
+                    (D, D), (D, D)]
         self.versus_test(axelrod.Defector(), expected_actions=actions, seed=2)
 
         # After responding to the 11th D (counted as 10 D), just start cooperating
         opponent_actions = [D] * 11 + [C] * 100
         changed_man = axelrod.MockPlayer(actions=opponent_actions)
-        actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D), (C, D), (D, D), (C, D), (D, D), (C, C)]
+        actions = [(C, D), (C, D), (C, D), (C, D), (C, D), (D, D), (C, D),
+                    (C, D), (D, D), (C, D), (D, D), (C, C)]
         actions += [(C,C)] * 99
         self.versus_test(changed_man, expected_actions=actions, seed=1)