Make Population take instances.

Ensures init kwargs get passed through.

Author: drvinceknight

src/axelrod_dojo/utils.py

@@ -138,16 +138,21 @@ def crossover(self, other):
         pass
 
 
-def score_params(params, objective, opponents, weights=None):
+def score_params(params, objective, opponents,
+                 opponent_init_kwargs=None,
+                 weights=None):
     """
     Return the overall mean score of a Params instance.
     """
     scores_for_all_opponents = []
     player = params.player()
 
-    for opponent_class in opponents:
+    if opponent_init_kwargs is None:
+        opponent_init_kwargs = [{} for _ in opponents]
+
+    for opponent_class, init_kwargs in zip(opponents, opponent_init_kwargs):
         player.reset()
-        opponent = opponent_class()
+        opponent = opponent_class(**init_kwargs)
         scores_for_this_opponent = objective(player, opponent)
         mean_vs_opponent = mean(scores_for_this_opponent)
         scores_for_all_opponents.append(mean_vs_opponent)
@@ -173,8 +178,10 @@ def __init__(self, params_class, params_args, size, objective, output_filename,
             self.bottleneck = bottleneck
         if opponents is None:
             self.opponents = axl.short_run_time_strategies
+            self.opponent_init_kwargs = None
         else:
-            self.opponents = opponents
+            self.opponents = [p.__class__ for p in opponents]
+            self.opponent_init_kwargs = [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)]
@@ -185,6 +192,7 @@ def score_all(self):
             self.population,
             repeat(self.objective),
             repeat(self.opponents),
+            repeat(self.opponent_init_kwargs),
             repeat(self.weights))
         results = self.pool.starmap(score_params, starmap_params)
         return results

tests/integration/test_fsm.py

@@ -17,7 +17,7 @@ def test_score(self):
         repetitions = 5
         num_states = 2
         mutation_rate = .1
-        opponents = axl.demo_strategies
+        opponents = [s() for s in axl.demo_strategies]
         size = 10
 
         objective = dojo.prepare_objective(name=name,
@@ -68,7 +68,7 @@ def test_score_with_weights(self):
         repetitions = 5
         num_states = 2
         mutation_rate = .1
-        opponents = axl.demo_strategies
+        opponents = [s() for s in axl.demo_strategies]
         size = 10
 
         objective = dojo.prepare_objective(name=name,

tests/unit/test_utils.py

@@ -193,6 +193,29 @@ def test_score(self):
         expected_score = 2.0949
         self.assertEqual(score, expected_score)
 
+    def test_with_init_kwargs(self):
+        axl.seed(0)
+        opponents = [axl.Random]
+        opponent_init_kwargs = [{"p": 0}]  # Creating a defector
+        objective = utils.prepare_objective()
+        params = DummyParams()
+        score = utils.score_params(params,
+                                   objective=objective,
+                                   opponent_init_kwargs=opponent_init_kwargs,
+                                   opponents=opponents)
+        expected_score = 0
+        self.assertEqual(score, expected_score)
+
+        opponent_init_kwargs = [{"p": 1}]  # Creating a cooperator
+        objective = utils.prepare_objective()
+        params = DummyParams()
+        score = utils.score_params(params,
+                                   objective=objective,
+                                   opponent_init_kwargs=opponent_init_kwargs,
+                                   opponents=opponents)
+        expected_score = 3.0
+        self.assertEqual(score, expected_score)
+
     def test_score_with_weights(self):
         axl.seed(0)
         opponents = axl.demo_strategies