branch switch

Author: eric-s-s

axelrod/my_t.py

@@ -3,6 +3,7 @@
 
 C, D = axl.Action.C, axl.Action.D
 
+
 @st.FlipTransformer()
 @st.FlipTransformer()
 class TestFlip(axl.Cooperator):
@@ -13,6 +14,7 @@ class TestFlip(axl.Cooperator):
 class Apology(axl.Cooperator):
     pass
 
+
 @st.DeadlockBreakingTransformer(name_prefix=None)
 class DeadlockBreaking(axl.Cooperator):
     pass

axelrod/strategy_transformers.py

@@ -147,6 +147,8 @@ def reducer(self_):
                 class_module = __import__(self_.__module__)
                 if self_.__class__.__name__ in dir(class_module):
                     return self_.__class__, (), self_.__dict__
+
+                
                 else:
                     print('oops {}  {}'.format(
                         self_.__class__.__name__, self_.original_class.__name__

axelrod/test_pickling.py

@@ -9,6 +9,21 @@
 
 
 class TestPickle(unittest.TestCase):
+
+    def assert_original_acts_same_as_pickled(self, player, turns=100):
+        copy = pickle.loads(pickle.dumps(player))
+        opponent_1 = axl.CyclerCCCDCD()
+        opponent_2 = axl.CyclerCCCDCD()
+        axl.seed(0)
+        match_1 = axl.Match((player, opponent_1), turns=turns)
+        result_1 = match_1.play()
+
+        axl.seed(0)
+        match_2 = axl.Match((copy, opponent_2), turns=turns)
+        result_2 = match_2.play()
+
+        self.assertEqual(result_1, result_2)
+
     def test_parameterized_player(self):
         p1 = axl.Cooperator()
         p2 = axl.Cycler('DDCCDD')
@@ -37,21 +52,11 @@ def test_final_transformer_called(self):
         results = match.play()
         self.assertEqual(results, [(C, C), (C, C), (D, D)])
 
+        self.assert_original_acts_same_as_pickled(axl.Alexei(), turns=10)
+
     def test_nice_transformer_called(self):
         player = axl.NMWEDeterministic()
-        copy = pickle.loads(pickle.dumps(player))
-        opponent_1 = axl.CyclerCCCDCD()
-        opponent_2 = axl.CyclerCCCDCD()
-        axl.seed(0)
-        match_1 = axl.Match((player, opponent_1), turns=100)
-        result_1 = match_1.play()
-
-        axl.seed(0)
-        match_2 = axl.Match((copy, opponent_2), turns=100)
-        result_2 = match_2.play()
-
-
-        self.assertEqual(result_1, result_2)
+        self.assert_original_acts_same_as_pickled(player, turns=10)
 
     def test_all(self):
         for s in axl.strategies: