Move filename back to tournament.play and add build_results. Update tests.

Author: marcharper

axelrod/match_generator.py

@@ -83,7 +83,8 @@ def build_match_chunks(self, noise=0):
 
     def build_single_match_params(self, noise=0):
         """Create a single match for a given pair"""
-        return (self.turns, self.game, None, noise)
+        cache = None
+        return (self.turns, self.game, cache, noise)
 
     def __len__(self):
         """Calculates the number of matches."""

axelrod/tests/unit/test_plot.py

@@ -71,9 +71,8 @@ def test_init_from_resulsetfromfile(self):
                      axelrod.TitForTat(),
                      axelrod.Defector()],
             turns=2,
-            repetitions=2,
-            filename=tmp_file.name)
-        tournament.play()
+            repetitions=2)
+        tournament.play(filename=tmp_file.name)
         tmp_file.close()
         rs = axelrod.ResultSetFromFile(tmp_file.name)
 

axelrod/tests/unit/test_resultset.py

@@ -335,9 +335,8 @@ class TestResultSetFromFile(unittest.TestCase):
                  axelrod.TitForTat(),
                  axelrod.Defector()],
         turns=2,
-        repetitions=1,
-        filename=tmp_file.name)
-    tournament.play()
+        repetitions=1)
+    tournament.play(filename=tmp_file.name)
     tmp_file.close()
 
 

axelrod/tests/unit/test_tournament.py

@@ -74,7 +74,6 @@ def test_init(self):
         self.assertTrue(tournament._with_morality)
         self.assertIsInstance(tournament._logger, logging.Logger)
         self.assertEqual(tournament.noise, 0.2)
-        self.assertEqual(tournament._parallel_repetitions, 10)
         anonymous_tournament = axelrod.Tournament(players=self.players)
         self.assertEqual(anonymous_tournament.name, 'axelrod')
 
@@ -331,9 +330,8 @@ def test_write_to_csv(self):
             players=self.players,
             game=self.game,
             turns=2,
-            repetitions=2,
-            filename=tmp_file.name)
-        tournament.play()
+            repetitions=2)
+        tournament.play(filename=tmp_file.name)
         tmp_file.close()
         with open(tmp_file.name, 'r') as f:
             written_data = [[int(r[0]), int(r[1])] + r[2:] for r in csv.reader(f)]
@@ -397,7 +395,6 @@ def test_init(self):
         self.assertTrue(tournament._with_morality)
         self.assertIsInstance(tournament._logger, logging.Logger)
         self.assertEqual(tournament.noise, 0.2)
-        self.assertEqual(tournament._parallel_repetitions, 10)
         anonymous_tournament = axelrod.Tournament(players=self.players)
         self.assertEqual(anonymous_tournament.name, 'axelrod')
 

axelrod/tournament.py

@@ -3,22 +3,22 @@
 import csv
 from collections import defaultdict
 import logging
-from tempfile import NamedTemporaryFile
-
 from multiprocessing import Process, Queue, cpu_count
-
+from tempfile import NamedTemporaryFile
+import warnings
 
 from .game import Game
-from .result_set import ResultSet, ResultSetFromFile
-from .match_generator import RoundRobinMatches, ProbEndRoundRobinMatches
 from .match import Match
+from .match_generator import RoundRobinMatches, ProbEndRoundRobinMatches
+from .result_set import ResultSet, ResultSetFromFile
+
 
 class Tournament(object):
     game = Game()
 
     def __init__(self, players, match_generator=RoundRobinMatches,
                  name='axelrod', game=None, turns=200, repetitions=10,
-                 processes=None, noise=0, with_morality=True, filename=None):
+                 processes=None, noise=0, with_morality=True):
         """
         Parameters
         ----------
@@ -51,34 +51,41 @@ def __init__(self, players, match_generator=RoundRobinMatches,
         self.match_generator = match_generator(players, turns, self.game,
                                                self.repetitions)
         self._with_morality = with_morality
-        self._parallel_repetitions = repetitions
         self._processes = processes
         self._logger = logging.getLogger(__name__)
-        self.interactions = defaultdict(list)
 
-        if not filename:
+    def setup_output_file(self, filename=None):
+        """Open a CSV writer for tournament output."""
+        if filename:
+            self.outputfile = open(filename, 'a')
+        else:
+            # Setup a temporary file
             self.outputfile = NamedTemporaryFile(mode='w')
             filename = self.outputfile.name
-        else:
-            self.outputfile = open(filename, 'w')
         self.writer = csv.writer(self.outputfile)
+        # Save filename for loading ResultSet later
         self.filename = filename
 
-    def play(self):
+    def play(self, build_results=True, filename=None):
         """
         Plays the tournament and passes the results to the ResultSet class
 
         Returns
         -------
         axelrod.ResultSet
         """
+        self.setup_output_file(filename)
+        if build_results and not filename:
+            warnings.warn("Tournament results will not be accessible since build_results=False and no filename was supplied.")
+            pass
         if self._processes is None:
             self._run_serial()
         else:
             self._run_parallel()
         # Make sure that python has finished writing to disk
         self.outputfile.flush()
-        return self._build_result_set()
+        if build_results:
+            return self._build_result_set()
 
     def _build_result_set(self):
         """

docs/tutorials/advanced/reading_and_writing_interactions.rst

@@ -7,8 +7,8 @@ a :code:`filename` argument to the :code:`play` method of a tournament::
 
     >>> import axelrod as axl
     >>> players = [s() for s in axl.basic_strategies]
-    >>> tournament = axl.Tournament(players, turns=4, repetitions=2, filename="basic_tournament.csv")
-    >>> results = tournament.play()
+    >>> tournament = axl.Tournament(players, turns=4, repetitions=2)
+    >>> results = tournament.play(filename="basic_tournament.csv")
 
 This will create a file `basic_tournament.csv` with data that looks something
 like::

test

@@ -1,50 +1,3 @@
 #!/usr/bin/env bash
 python -m unittest discover axelrod/tests/
 python doctests.py
-
-# Deleting outputs:
-
-rm basic_strategies_boxplot.svg
-rm basic_strategies_lengthplot.svg
-rm basic_strategies_payoff.svg
-rm basic_strategies_pdplot.svg
-rm basic_strategies_prob_end.csv
-rm basic_strategies_prob_end_boxplot.svg
-rm basic_strategies_prob_end_lengthplot.svg
-rm basic_strategies_prob_end_payoff.svg
-rm basic_strategies_prob_end_pdplot.svg
-rm basic_strategies_prob_end_reproduce.svg
-rm basic_strategies_prob_end_sdvplot.svg
-rm basic_strategies_prob_end_winplot.svg
-rm basic_strategies_reproduce.svg
-rm basic_strategies_sdvplot.svg
-rm basic_strategies_winplot.svg
-rm ordinary_strategies.csv
-rm ordinary_strategies_boxplot.svg
-rm ordinary_strategies_lengthplot.svg
-rm ordinary_strategies_payoff.svg
-rm ordinary_strategies_pdplot.svg
-rm ordinary_strategies_prob_end.csv
-rm ordinary_strategies_prob_end_boxplot.svg
-rm ordinary_strategies_prob_end_lengthplot.svg
-rm ordinary_strategies_prob_end_payoff.svg
-rm ordinary_strategies_prob_end_pdplot.svg
-rm ordinary_strategies_prob_end_reproduce.svg
-rm ordinary_strategies_prob_end_sdvplot.svg
-rm ordinary_strategies_prob_end_winplot.svg
-rm ordinary_strategies_reproduce.svg
-rm ordinary_strategies_sdvplot.svg
-rm ordinary_strategies_winplot.svg
-rm test-prob-end.csv
-rm test-prob-end_boxplot.svg
-rm test-prob-end_lengthplot.svg
-rm test-prob-end_payoff.svg
-rm test-prob-end_pdplot.svg
-rm test-prob-end_sdvplot.svg
-rm test-prob-end_winplot.svg
-rm test_boxplot.svg
-rm test_lengthplot.svg
-rm test_payoff.svg
-rm test_pdplot.svg
-rm test_sdvplot.svg
-rm test_winplot.svg