A few more style and param corrections

Author: marcharper

axelrod/_strategy_utils.py

@@ -112,8 +112,7 @@ def __repr__(self):
 @Memoized
 def recursive_thue_morse(n):
     """The recursive definition of the Thue-Morse sequence. The first few terms
-    of the Thue-Morse sequence are:
-    0 1 1 0 1 0 0 1 1 0 0 1 0 1 1 0 . . ."""
+    of the Thue-Morse sequence are: 0 1 1 0 1 0 0 1 1 0 0 1 0 1 1 0 . . ."""
 
     if n == 0:
         return 0

axelrod/match_generator.py

@@ -126,7 +126,7 @@ def build_single_match_params(self):
             self.sample_length(self.prob_end), self.game, None, self.noise,
             {'length': float('inf'), 'game': self.game, 'noise': self.noise})
 
-    def sample_length(self, prob_end):
+    def sample_length(self):
         """
         Sample length of a game.
 

axelrod/player.py

@@ -149,10 +149,9 @@ def clone(self):
 
     def reset(self):
         """Resets history.
-
-        When creating strategies that create new attributes then this method should be
-        re-written (in the inherited class) and should not only reset history but also
-        rest all other attributes.
+        When creating strategies that create new attributes then this method
+        should be re-written (in the inherited class) and should not only reset
+        history but also rest all other attributes.
         """
         self.history = []
         self.cooperations = 0

axelrod/plot.py

@@ -103,14 +103,6 @@ def winplot(self, title=None):
     def _sd_ordering(self):
         return self.result_set.ranking
 
-        # Sort by median then max
-        # from operator import itemgetter
-        # diffs = self.result_set.score_diffs
-        # to_sort = [(median(d), max(d), i) for (i, d) in enumerate(diffs)]
-        # to_sort.sort(reverse=True, key=itemgetter(0, 1))
-        # ordering = [x[-1] for x in to_sort]
-        # return ordering
-
     @property
     def _sdv_plot_dataset(self):
         ordering = self._sd_ordering
@@ -231,7 +223,8 @@ def stackplot(self, eco, title=None, logscale=True):
         for i, n in enumerate(self.result_set.ranked_names):
             x = -0.01
             y = (i + 0.5) * 1.0 / self.result_set.nplayers
-            ax.annotate(n, xy=(x, y), xycoords=trans, clip_on=False, va='center', ha='right', fontsize=5)
+            ax.annotate(n, xy=(x, y), xycoords=trans, clip_on=False,
+                        va='center', ha='right', fontsize=5)
             ticks.append(y)
         ax.set_yticks(ticks)
         ax.tick_params(direction='out')