Merge pull request #556 from Axelrod-Python/555

Prob End Tournament can now take a cache

Author: meatballs

axelrod/tests/unit/test_tournament.py

@@ -568,30 +568,18 @@ def test_init(self):
         anonymous_tournament = axelrod.Tournament(players=self.players)
         self.assertEqual(anonymous_tournament.name, 'axelrod')
 
-    @given(s=lists(sampled_from(axelrod.strategies),
-                   min_size=2,  # Errors are returned if less than 2 strategies
-                   max_size=5, unique=True),
-           prob_end=floats(min_value=.1, max_value=.9),
-           repetitions=integers(min_value=2, max_value=4),
-           rm=random_module())
-    @settings(max_examples=50, timeout=0)
-    @example(s=test_strategies, prob_end=test_prob_end,
-             repetitions=test_repetitions,
-             rm=random.seed(0))
-    def test_build_cache_never_required(self, s, prob_end, repetitions, rm):
-        """
-        As the matches have a sampled length a cache is never required.
-        """
-        players = [strat() for strat in s]
-
+        # Test init when passing a cache:
+        cache = axelrod.DeterministicCache()
         tournament = axelrod.ProbEndTournament(
             name=self.test_name,
-            players=players,
+            players=self.players,
             game=self.game,
-            prob_end=prob_end,
-            repetitions=repetitions)
-        self.assertFalse(tournament._build_cache_required())
-
+            prob_end=self.test_prob_end,
+            processes=4,
+            noise=0.2,
+            deterministic_cache=cache)
+        self.assertEqual(tournament.deterministic_cache, cache)
+        self.assertTrue(tournament.prebuilt_cache)
 
     @given(s=lists(sampled_from(axelrod.strategies),
                    min_size=2,  # Errors are returned if less than 2 strategies

axelrod/tournament.py

@@ -310,8 +310,8 @@ class ProbEndTournament(Tournament):
 
     def __init__(self, players, match_generator=ProbEndRoundRobinMatches,
                  name='axelrod', game=None, prob_end=.5, repetitions=10,
-                 processes=None, prebuilt_cache=False, noise=0,
-                 with_morality=True):
+                 processes=None, deterministic_cache=None, prebuilt_cache=False,
+                 noise=0, with_morality=True):
         """
         Parameters
         ----------
@@ -339,15 +339,10 @@ def __init__(self, players, match_generator=ProbEndRoundRobinMatches,
         super(ProbEndTournament, self).__init__(
             players, name=name, game=game, turns=float("inf"),
             repetitions=repetitions, processes=processes,
+            deterministic_cache=deterministic_cache,
             prebuilt_cache=prebuilt_cache, noise=noise,
             with_morality=with_morality)
 
         self.prob_end = prob_end
         self.match_generator = ProbEndRoundRobinMatches(
             players, prob_end, self.game, self.deterministic_cache)
-
-    def _build_cache_required(self):
-        """
-        A cache is never required (as every Match length can be different)
-        """
-        return False