Changing behaviour to classifier

Author: drvinceknight

axelrod/__init__.py

@@ -10,4 +10,4 @@
 from .tournament import *
 from .tournament_manager import *
 from .strategies import *
-from .ecosystem import *
+from .ecosystem import *

axelrod/player.py

@@ -29,8 +29,8 @@ class Player(object):
     """
 
     name = "Player"
-    behaviour = {}
-    default_behaviour = {
+    classifier = {}
+    default_classifier = {
         'stochastic': False,
         'memory_depth': float('inf'),
         'inspects_source': None,
@@ -41,14 +41,14 @@ class Player(object):
     def __init__(self):
         """Initiates an empty history and 0 score for a player."""
         self.history = []
-        self.behaviour = copy.copy(self.behaviour)
-        self.behaviour['stochastic'] = (
+        self.classifier = copy.copy(self.classifier)
+        self.classifier['stochastic'] = (
             "random" in inspect.getsource(self.__class__))
         if self.name == "Player":
-            self.behaviour['stochastic'] = False
-        for dimension in self.default_behaviour:
-            if dimension not in self.behaviour:
-                self.behaviour[dimension] = self.default_behaviour[dimension]
+            self.classifier['stochastic'] = False
+        for dimension in self.default_classifier:
+            if dimension not in self.classifier:
+                self.classifier[dimension] = self.default_classifier[dimension]
         self.tournament_attributes = {'length': -1, 'game': None}
         self.cooperations = 0
         self.defections = 0

axelrod/round_robin.py

@@ -97,8 +97,8 @@ def _pair_of_players(self, player1_index, player2_index):
     def _stochastic_interaction(self, player1, player2):
         return (
             self._noise or
-            player1.behaviour['stochastic'] or
-            player2.behaviour['stochastic'])
+            player1.classifier['stochastic'] or
+            player2.classifier['stochastic'])
 
     def _play_single_interaction(self, player1, player2, classes):
         turn = 0
@@ -130,7 +130,7 @@ def _cache_update_required(self, p1, p2):
         return (
             not self._noise and
             self.cache_mutable and
-            not (p1.behaviour['stochastic'] or p2.behaviour['stochastic']))
+            not (p1.classifier['stochastic'] or p2.classifier['stochastic']))
 
     def _calculate_cooperation(self, player):
         return player.history.count('C')

axelrod/strategies/_strategies.py

@@ -137,10 +137,10 @@ def is_cheater(s):
     """
     A function to check if a strategy cheats.
     """
-    behaviour = s.behaviour
-    return behaviour['inspects_source'] or\
-           behaviour['manipulates_source'] or\
-           behaviour['manipulates_state']
+    classifier = s.classifier
+    return classifier['inspects_source'] or\
+           classifier['manipulates_source'] or\
+           classifier['manipulates_state']
 
 ordinary_strategies = [s for s in strategies if not is_cheater(s)]
 cheating_strategies = [s for s in strategies if is_cheater(s)]

axelrod/strategies/alternator.py

@@ -5,7 +5,7 @@ class Alternator(Player):
     """A player who alternates between cooperating and defecting."""
 
     name = 'Alternator'
-    behaviour = {
+    classifier = {
         'memory_depth': 1,
         'stochastic': False,
         'inspects_source': False,

axelrod/strategies/appeaser.py

@@ -4,12 +4,12 @@
 class Appeaser(Player):
     """A player who tries to guess what the opponent wants.
 
-    Switch the behaviour every time the opponent plays 'D'.
+    Switch the classifier every time the opponent plays 'D'.
     Start with 'C', switch between 'C' and 'D' when opponent plays 'D'.
     """
 
     name = 'Appeaser'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),  # Depends on internal memory.
         'stochastic': False,
         'inspects_source': False,

axelrod/strategies/averagecopier.py

@@ -8,7 +8,7 @@ class AverageCopier(Player):
     """The player will cooperate with probability p if the opponent's cooperation ratio is p."""
 
     name = 'Average Copier'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),  # Long memory
         'stochastic': True,
         'inspects_source': False,
@@ -32,7 +32,7 @@ class NiceAverageCopier(Player):
     """Same as Average Copier, but always starts by cooperating."""
 
     name = 'Nice Average Copier'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),  # Long memory
         'stochastic': True,
         'inspects_source': False,

axelrod/strategies/axelrod_tournaments.py

@@ -16,7 +16,7 @@ class Davis(Player):
     defecting if at any point the opponent has defected."""
 
     name = 'Davis'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),  # Long memory
         'stochastic': False,
         'inspects_source': False,
@@ -45,7 +45,7 @@ class Feld(Player):
     """
 
     name = "Feld"
-    behaviour = {
+    classifier = {
         'memory_depth': 200, # Varies actually, eventually becomes depth 1
         'stochastic': False,
         'inspects_source': False,
@@ -90,7 +90,7 @@ class Shubik(Player):
     """
 
     name = 'Shubik'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': False,
         'inspects_source': False,
@@ -147,7 +147,7 @@ class Tullock(Player):
     than the opponent has in previous rounds."""
 
     name = "Tullock"
-    behaviour = {
+    classifier = {
         'memory_depth': 11, # long memory, modified by init
         'stochastic': False,
         'inspects_source': False,
@@ -181,7 +181,7 @@ class Champion(Player):
     """
 
     name = "Champion"
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': False,
         'inspects_source': False,
@@ -215,7 +215,7 @@ class Eatherley(Player):
     """
 
     name = "Eatherley"
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': False,
         'inspects_source': False,
@@ -248,7 +248,7 @@ class Tester(Player):
     """
 
     name = "Tester"
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': False,
         'inspects_source': False,

axelrod/strategies/backstabber.py

@@ -8,7 +8,7 @@ class BackStabber(Player):
     """
 
     name = 'BackStabber'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': False,
         'inspects_source': False,
@@ -35,7 +35,7 @@ class DoubleCrosser(Player):
     """
 
     name = 'DoubleCrosser'
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': False,
         'inspects_source': False,

axelrod/strategies/calculator.py

@@ -11,7 +11,7 @@ class Calculator(Player):
     """
 
     name = "Calculator"
-    behaviour = {
+    classifier = {
         'memory_depth': float('inf'),
         'stochastic': True,
         'inspects_source': False,