Fix the data set dimensions for the sdvplot. (#1130)

* Fix the data set dimensions for the sdvplot.

This closes #1129.

I could not find anything in the release notes
<http://matplotlib.org/users/whats_new.html> however I think this is due to the fact that mpl 2.1 got rid of the availability to handle the unflatten sub list (so this fix will still work with previous versions of mpl).

* Fix tqdm to be compatible with new release.

* Add type annotation needed for latest mypy.

* Pinning hypothesis.

This version seems to cover all our needs and is still ensuring
coverage. As hypothesis seems to be developing/changing this just makes
things easier for us.

* Clarify iteration variables.

* Add an extra space for PEP8.

Author: drvinceknight

axelrod/plot.py

@@ -112,7 +112,8 @@ def _sd_ordering(self):
     @property
     def _sdv_plot_dataset(self):
         ordering = self._sd_ordering
-        diffs = self.result_set.score_diffs
+        diffs = [[score_diff for opponent in player for score_diff in opponent]
+                 for player in self.result_set.score_diffs]
         # Reorder and grab names
         diffs = [diffs[i] for i in ordering]
         ranked_names = [str(self.players[i]) for i in ordering]

axelrod/tests/unit/test_plot.py

@@ -70,6 +70,12 @@ def setUpClass(cls):
             [[2, 2, 2], [0, 0, 0], [0, 0, 0]],
             ['Defector', 'Tit For Tat', 'Alternator'])
 
+        cls.expected_sdvplot_dataset = (
+            [[3, 3, 3, 1, 1, 1, 0, 0, 0],
+             [0, 0, 0, 0, 0, 0, -1, -1, -1],
+             [0, 0, 0, 0, 0, 0, -3, -3, -3]],
+            ['Defector', 'Tit For Tat', 'Alternator'])
+
     def test_default_cmap(self):
         cmap = axelrod.plot.default_cmap('0.0')
         self.assertEqual(cmap, 'YlGnBu')
@@ -173,6 +179,12 @@ def test_winplot(self):
         self.assertIsInstance(fig, matplotlib.pyplot.Figure)
         plt.close(fig)
 
+    def test_sdvplot_dataset(self):
+        plot = axelrod.Plot(self.test_result_set)
+        self.assertSequenceEqual(
+            plot._sdv_plot_dataset,
+            self.expected_sdvplot_dataset)
+
     def test_sdvplot(self):
         plot = axelrod.Plot(self.test_result_set)
         fig = plot.sdvplot()

axelrod/tests/unit/test_tournament.py

@@ -251,7 +251,7 @@ def test_get_progress_bar(self):
         self.test_tournament.use_progress_bar = True
         pbar = self.test_tournament._get_progress_bar()
         self.assertIsInstance(pbar, tqdm)
-        self.assertEqual(pbar.desc, 'Playing matches: ')
+        self.assertEqual(pbar.desc, 'Playing matches')
         self.assertEqual(pbar.n, 0)
         self.assertEqual(pbar.total, self.test_tournament.match_generator.size)
 
@@ -260,7 +260,7 @@ def test_get_progress_bar(self):
                                             edges=new_edges)
         new_tournament.use_progress_bar = True
         pbar = new_tournament._get_progress_bar()
-        self.assertEqual(pbar.desc, 'Playing matches: ')
+        self.assertEqual(pbar.desc, 'Playing matches')
         self.assertEqual(pbar.n, 0)
         self.assertEqual(pbar.total, len(new_edges))
 
@@ -327,7 +327,7 @@ def test_no_progress_bar_play(self):
         self.assertIsInstance(results, axelrod.ResultSet)
 
     def assert_play_pbar_correct_total_and_finished(self, pbar, total):
-        self.assertEqual(pbar.desc, 'Playing matches: ')
+        self.assertEqual(pbar.desc, 'Playing matches')
         self.assertEqual(pbar.total, total)
         self.assertEqual(pbar.n, total)
         self.assertTrue(pbar.disable, True)

axelrod/tournament.py

@@ -255,8 +255,8 @@ def _run_parallel(self, processes: int=2) -> bool:
         """
         # At first sight, it might seem simpler to use the multiprocessing Pool
         # Class rather than Processes and Queues. However, this way is faster.
-        work_queue = Queue()
-        done_queue = Queue()
+        work_queue = Queue()  # type: Queue
+        done_queue = Queue()  # type: Queue
         workers = self._n_workers(processes=processes)
 
         chunks = self.match_generator.build_match_chunks()

requirements.txt

@@ -1,6 +1,6 @@
 numpy>=1.9.2
 matplotlib>=1.4.2
-hypothesis>=3.2
 tqdm>=3.4.0
 prompt-toolkit>=1.0.7
-scipy>=0.19.0
+scipy>=0.19.0
+hypothesis==3.2