Revert "remove __repr__ override in GoByMajority (#802)"

This reverts commit 180e28c.

Author: Chadys

axelrod/strategies/gobymajority.py

@@ -51,6 +51,15 @@ def __init__(self, memory_depth: int = float('inf'), soft: bool = True) -> None:
             self.memory = self.classifier['memory_depth']
         else:
             self.memory = 0
+        self.name = (
+            'Go By Majority' + (self.memory > 0) * (": %i" % self.memory))
+        if self.soft:
+            self.name = "Soft " + self.name
+        else:
+            self.name = "Hard " + self.name
+
+    def __repr__(self):
+        return self.name
 
     def strategy(self, opponent: Player) -> Action:
         """This is affected by the history of the opponent.
@@ -77,7 +86,7 @@ class GoByMajority40(GoByMajority):
     """
     GoByMajority player with a memory of 40.
     """
-    name = 'Soft Go By Majority 40'
+    name = 'Go By Majority 40'
     classifier = copy.copy(GoByMajority.classifier)
     classifier['memory_depth'] = 40
 
@@ -89,7 +98,7 @@ class GoByMajority20(GoByMajority):
     """
     GoByMajority player with a memory of 20.
     """
-    name = 'Soft Go By Majority 20'
+    name = 'Go By Majority 20'
     classifier = copy.copy(GoByMajority.classifier)
     classifier['memory_depth'] = 20
 
@@ -101,7 +110,7 @@ class GoByMajority10(GoByMajority):
     """
     GoByMajority player with a memory of 10.
     """
-    name = 'Soft Go By Majority 10'
+    name = 'Go By Majority 10'
     classifier = copy.copy(GoByMajority.classifier)
     classifier['memory_depth'] = 10
 
@@ -113,7 +122,7 @@ class GoByMajority5(GoByMajority):
     """
     GoByMajority player with a memory of 5.
     """
-    name = 'Soft Go By Majority 5'
+    name = 'Go By Majority 5'
     classifier = copy.copy(GoByMajority.classifier)
     classifier['memory_depth'] = 5
 

axelrod/tests/strategies/test_gobymajority.py

@@ -8,7 +8,7 @@
 
 class TestHardGoByMajority(TestPlayer):
 
-    name = "Hard Go By Majority: inf"
+    name = "Hard Go By Majority"
     player = axelrod.HardGoByMajority
     default_soft = False
     eq_play = D
@@ -43,7 +43,7 @@ def test_default_soft(self):
 
 class TestGoByMajority(TestHardGoByMajority):
 
-    name = "Go By Majority: inf, True"
+    name = "Soft Go By Majority"
     player = axelrod.GoByMajority
     default_soft = True
     eq_play = C
@@ -63,6 +63,20 @@ def test_soft(self):
         player = self.player(soft=False)
         self.assertFalse(player.soft)
 
+    def test_name(self):
+        player = self.player(soft=True)
+        self.assertEqual(player.name, "Soft Go By Majority")
+        player = self.player(soft=False)
+        self.assertEqual(player.name, "Hard Go By Majority")
+
+    def test_repr(self):
+        player = self.player(soft=True)
+        name = str(player)
+        self.assertEqual(name, "Soft Go By Majority")
+        player = self.player(soft=False)
+        name = str(player)
+        self.assertEqual(name, "Hard Go By Majority")
+
 
 def factory_TestGoByRecentMajority(L, soft=True):
 
@@ -74,7 +88,7 @@ def factory_TestGoByRecentMajority(L, soft=True):
 
     class TestGoByRecentMajority(TestPlayer):
 
-        name = "{} Go By Majority {}".format(prefix, L)
+        name = "{} Go By Majority: {}".format(prefix, L)
         player = getattr(axelrod, "{}GoByMajority{}".format(prefix2, L))
 
         expected_classifier = {