From 3d9608a572b837337c11cc8e164a5fb9a6c5b5da Mon Sep 17 00:00:00 2001 From: Owen Campbell Date: Tue, 14 Mar 2017 10:02:44 +0000 Subject: [PATCH 1/2] Add test for Joss-Ann transformer with probabilities > 1 --- axelrod/tests/unit/test_strategy_transformers.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/axelrod/tests/unit/test_strategy_transformers.py b/axelrod/tests/unit/test_strategy_transformers.py index 656ae5d61..8d17c90d3 100644 --- a/axelrod/tests/unit/test_strategy_transformers.py +++ b/axelrod/tests/unit/test_strategy_transformers.py @@ -145,6 +145,13 @@ def test_jossann_transformer(self): p1.play(p2) self.assertEqual(p1.history, [D, C, C, D, D]) + probability = (0.6, 0.6) + p1 = JossAnnTransformer(probability)(axelrod.Cooperator)() + p2 = axelrod.Cooperator() + for _ in range(5): + p1.play(p2) + self.assertEqual(p1.history, [D, C, D, D, C]) + def test_noisy_transformer(self): """Tests that the noisy transformed does flip some moves.""" random.seed(5) From 26e69135714ed9be067e688c0fc084a58900832f Mon Sep 17 00:00:00 2001 From: Owen Campbell Date: Tue, 14 Mar 2017 10:04:40 +0000 Subject: [PATCH 2/2] Replace attempted tuple assignment with new tuple generation --- axelrod/strategy_transformers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axelrod/strategy_transformers.py b/axelrod/strategy_transformers.py index 4c72d4a55..90ee27524 100644 --- a/axelrod/strategy_transformers.py +++ b/axelrod/strategy_transformers.py @@ -404,7 +404,7 @@ def joss_ann_wrapper(player, opponent, proposed_action, probability): action: an axelrod.Action, C or D """ if sum(probability) > 1: - probability[:] = [i / sum(probability) for i in probability] + probability = tuple([i / sum(probability) for i in probability]) remaining_probability = max(0, 1 - probability[0] - probability[1]) probability += (remaining_probability,)