Merge pull request #39 from Axelrod-Python/second

Add code snippet to rerun Axelrod's second tournament to readme

Author: meatballs

README.rst

@@ -18,15 +18,33 @@ Installation
 Usage
 =====
 
-::
+Running a match:
+
+.. code-block:: python
+
+   >>> import axelrod_fortran as axlf
+   >>> import axelrod as axl
+   >>> p1 = axlf.Player('k31r')
+   >>> p2 = axlf.Player('k33r')
+   >>> match = axl.Match((p1, p2), turns=5)
+   >>> match.play()
+   [(C, C), (C, C), (C, D), (C, D), (C, C)]
+
+Running an instance of Axelrod's second tournament:
+
+.. code-block:: python
+
+   >>> import axelrod_fortran as axlf
+   >>> import axelrod as axl
+   >>> players = [axlf.Player(name) for name in axlf.second_tournament_strategies]
+   >>> print(len(players), "players")
+   62 players
+   >>> tournament = axl.Tournament(players, repetitions=1, turns=200)
+   >>> results = tournament.play()
+   >>> results.write_summary('summary.csv')
+   >>> plot = axl.Plot(results)
+   >>> plot.save_all_plots("second_tournament")
 
-    >>> import axelrod_fortran as axlf
-    >>> import axelrod as axl
-    >>> p1 = axlf.Player('k31r')
-    >>> p2 = axlf.Player('k33r')
-    >>> match = axl.Match((p1, p2), turns=5)
-    >>> match.play()
-    [(C, C), (C, C), (C, D), (C, D), (C, C)]
 
 Contributing
 ============

src/axelrod_fortran/__init__.py

@@ -1,4 +1,5 @@
 __version__ = "0.1.0"
 
 from .player import Player
-from .strategies import characteristics, all_strategies
+from .strategies import (all_strategies, characteristics,
+                         second_tournament_strategies)

src/axelrod_fortran/player.py

@@ -3,7 +3,6 @@
 import axelrod as axl
 from axelrod.interaction_utils import compute_final_score
 from axelrod.action import Action
-from axelrod import Game
 from ctypes import cdll, c_int, c_float, byref, POINTER
 from .strategies import characteristics
 
@@ -49,7 +48,7 @@ def original_name(self, value):
         if value in characteristics:
             self.__original_name = value
         else:
-            raise ValueError(f'{value} is not a valid Fortran function')
+            raise ValueError('{} is not a valid Fortran function'.format(value))
 
     @property
     def original_function(self):

src/axelrod_fortran/strategies.py

@@ -349,3 +349,8 @@
 }
 
 all_strategies = characteristics.keys()
+
+# Players from Axelrod's second tournament.
+second_tournament_strategies = [
+    name for name in characteristics.keys()
+    if characteristics[name]["original_rank"] is not None]