More type hints

Author: MariosZoulias

axelrod/strategies/finite_state_machines.py

@@ -1,4 +1,4 @@
-from axelrod.actions import Actions
+from axelrod.actions import Actions, Action
 from axelrod.player import Player
 
 C, D = Actions.C, Actions.D
@@ -26,13 +26,13 @@ def __init__(self, transitions, initial_state):
         for (state, opp_action, next_state, next_action) in transitions:
             self.state_transitions[(state, opp_action)] = (next_state, next_action)
 
-    def move(self, opponent_action):
+    def move(self, opponent_action: Action) -> Action:
         """Computes the response move and changes state."""
         next_state, next_action = self.state_transitions[(self.state, opponent_action)]
         self.state = next_state
         return next_action
 
-    def __eq__(self, other):
+    def __eq__(self, other: Player) -> bool:
         """Equality of two FSMs"""
         check = True
         for attr in ["state", "state_transitions"]:
@@ -56,7 +56,7 @@ class FSMPlayer(Player):
     }
 
     def __init__(self, transitions=None, initial_state=None,
-                 initial_action=None):
+                 initial_action=None) -> None:
         if not transitions:
             # Tit For Tat
             transitions = [(1, C, 1, C), (1, D, 1, D)]
@@ -68,7 +68,7 @@ def __init__(self, transitions=None, initial_state=None,
         self.initial_action = initial_action
         self.fsm = SimpleFSM(transitions, initial_state)
 
-    def strategy(self, opponent):
+    def strategy(self, opponent: Player) -> Action:
         if len(self.history) == 0:
             return self.initial_action
         else:
@@ -78,7 +78,7 @@ def strategy(self, opponent):
             self.state = self.fsm.state
             return action
 
-    def reset(self):
+    def reset(self) -> None:
         super().reset()
         self.fsm.state = self.initial_state
         self.state = self.initial_state
@@ -100,7 +100,7 @@ class Fortress3(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, D, 2, D),
             (1, C, 1, D),
@@ -129,7 +129,7 @@ class Fortress4(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, C, 1, D),
             (1, D, 2, D),
@@ -158,7 +158,7 @@ class Predator(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (0, C, 0, D),
             (0, D, 1, D),
@@ -201,7 +201,7 @@ class Pun1(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, C, 2, C),
             (1, D, 2, C),
@@ -226,7 +226,7 @@ class Raider(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (0, C, 2, D),
             (0, D, 2, D),
@@ -255,7 +255,7 @@ class Ripoff(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, C, 2, C),
             (1, D, 3, C),
@@ -282,7 +282,7 @@ class SolutionB1(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, C, 2, D),
             (1, D, 1, D),
@@ -309,7 +309,7 @@ class SolutionB5(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, C, 2, C),
             (1, D, 6, D),
@@ -342,7 +342,7 @@ class Thumper(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (1, C, 1, C),
             (1, D, 2, D),
@@ -373,7 +373,7 @@ class EvolvedFSM4(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (0, C, 0, C),
             (0, D, 2, D),
@@ -409,7 +409,7 @@ class EvolvedFSM16(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (0, C, 0, C),
             (0, D, 12, D),
@@ -469,7 +469,7 @@ class EvolvedFSM16Noise05(FSMPlayer):
         'manipulates_state': False
     }
 
-    def __init__(self):
+    def __init__(self) -> None:
         transitions = (
             (0, C, 8, C),
             (0, D, 3, D),

axelrod/strategies/hmm.py

@@ -63,7 +63,7 @@ def is_well_formed(self) -> bool:
             return False
         return True
 
-    def __eq__(self, other) -> bool:
+    def __eq__(self, other: Player) -> bool:
         """Equality of two HMMs"""
         check = True
         for attr in ["transitions_C", "transitions_D",
@@ -72,7 +72,7 @@ def __eq__(self, other) -> bool:
         return check
 
 
-    def move(self, opponent_action) -> Action:
+    def move(self, opponent_action: Action) -> Action:
         """Changes state and computes the response action.
 
         Parameters
@@ -140,7 +140,7 @@ def is_stochastic(self) -> bool:
             return True
         return False
 
-    def strategy(self, opponent) -> Action:
+    def strategy(self, opponent: Player) -> Action:
         if len(self.history) == 0:
             return self.initial_action
         else:

axelrod/strategies/human.py

@@ -1,5 +1,5 @@
 from os import linesep
-from axelrod.actions import Actions
+from axelrod.actions import Actions, Action
 from axelrod.player import Player
 from prompt_toolkit import prompt
 from prompt_toolkit.token import Token
@@ -19,7 +19,7 @@ class ActionValidator(Validator):
     Described at http://python-prompt-toolkit.readthedocs.io/en/latest/pages/building_prompts.html#input-validation
     """
 
-    def validate(self, document):
+    def validate(self, document) -> None:
         text = document.text
 
         if text and text.upper() not in ['C', 'D']:
@@ -118,7 +118,7 @@ def _status_messages(self):
             'print': print_statement
         }
 
-    def _get_human_input(self):  # pragma: no cover
+    def _get_human_input(self) -> Action:  # pragma: no cover
         """
         A method to prompt the user for input, validate it and display
         the bottom toolbar.
@@ -137,7 +137,7 @@ def _get_human_input(self):  # pragma: no cover
 
         return action.upper()
 
-    def strategy(self, opponent, input_function=None):
+    def strategy(self, opponent: Player, input_function=None):
         """
         Ordinarily, the strategy prompts for keyboard input rather than
         deriving its own action.

axelrod/strategies/prober.py

@@ -1,6 +1,8 @@
 from axelrod.actions import Actions, Action
 from axelrod.player import Player
 from axelrod.random_ import random_choice
+from typing import List
+Vector = List[float]
 
 import random
 
@@ -258,7 +260,7 @@ class NaiveProber(Player):
         'manipulates_state': False
     }
 
-    def __init__(self, p: Player=0.1) -> None:
+    def __init__(self, p: float=0.1) -> None:
         """
         Parameters
         ----------

run_mypy.py

@@ -46,6 +46,8 @@
            "axelrod/strategies/rand.py",
            "axelrod/strategies/titfortat.py",
            "axelrod/strategies/hmm.py",
+           "axelrod/strategies/human.py",
+           "axelrod/strategies/finite_state_machines.py",
            "axelrod/strategies/worse_and_worse.py"]
 
 exit_codes = []