branch switch

axelrod/strategy_transformers.py

@@ -299,22 +299,31 @@ def dual_wrapper(player, opponent, proposed_action):
     """
 
     if not player.history:
-        player.use_history = []
+        player.original_player_history = []
 
-    temp = player.history[:]
-    player.history = player.use_history[:]
+    temp_history = player.history[:]
+    player.history = player.original_player_history[:]
+
+    switch_cooperations_and_defections(player)
 
     if is_strategy_static(player.original_class):
         action = player.original_class.strategy(opponent)
     else:
         action = player.original_class.strategy(player, opponent)
 
-    player.history = temp[:]
+    player.history = temp_history[:]
+    switch_cooperations_and_defections(player)
 
-    player.use_history.append(action)
+    player.original_player_history.append(action)
     return action.flip()
 
 
+def switch_cooperations_and_defections(player):
+    temp = player.cooperations
+    player.cooperations = player.defections
+    player.defections = temp
+
+
 DualTransformer = StrategyTransformerFactory(dual_wrapper, name_prefix="Dual")
 
 

axelrod/tests/unit/test_pickling.py

@@ -326,10 +326,9 @@ def test_regression_test_dual_jossann(self):
         self.assert_dual_wrapper_correct(klass)
 
     def test_dual_transformer_with_fsm_and_sequence_players(self):
-        self.assert_dual_wrapper_correct(axl.Fortress3)
-        self.assert_dual_wrapper_correct(axl.Fortress4)
 
-        self.assert_dual_wrapper_correct(axl.ThueMorse)
+        for s in axl.strategies:
+            self.assert_dual_wrapper_correct(s)
 
     def assert_dual_wrapper_correct(self, player_class):
         p1 = player_class()