Merge pull request #35 from Axelrod-Python/add-abilit-to-pass-initial-population

Add ability to pass initial population.

Author: marcharper

src/axelrod_dojo/utils.py

@@ -171,7 +171,7 @@ class Population(object):
     """Population class that implements the evolutionary algorithm."""
     def __init__(self, params_class, params_args, size, objective, output_filename,
                  bottleneck=None, opponents=None, processes=1, weights=None,
-                 sample_count=None):
+                 sample_count=None, population=None):
         self.params_class = params_class
         self.bottleneck = bottleneck
         if processes == 0:
@@ -192,7 +192,12 @@ def __init__(self, params_class, params_args, size, objective, output_filename,
                     PlayerInfo(p.__class__, p.init_kwargs) for p in opponents]
         self.generation = 0
         self.params_args = params_args
-        self.population = [params_class(*params_args) for _ in range(self.size)]
+
+        if population is not None:
+            self.population = population
+        else:
+            self.population = [params_class(*params_args) for _ in range(self.size)]
+
         self.weights = weights
         self.sample_count = sample_count
 

tests/integration/test_fsm.py

@@ -59,7 +59,20 @@ def test_score(self):
             for parameters in best:
                 self.assertIsInstance(parameters, dojo.FSMParams)
 
-            self.assertEqual(best[0].__repr__(), best_params)
+        # Test that can use these loaded params in a new algorithm instance
+        population = dojo.Population(params_class=dojo.FSMParams,
+                                     params_args=(num_states, mutation_rate),
+                                     size=size,
+                                     objective=objective,
+                                     output_filename=self.temporary_file.name,
+                                     opponents=opponents,
+                                     population=best,
+                                     bottleneck=2,
+                                     processes=1)
+        generations = 4
+        axl.seed(0)
+        population.run(generations)
+        self.assertEqual(population.generation, 4)
 
     def test_score_with_weights(self):
         name = "score"