From b4e3777ce91bba8b91c40e4086aaa3a39ecff0b4 Mon Sep 17 00:00:00 2001 From: Bethany Garcia Date: Tue, 21 May 2019 18:54:24 -0700 Subject: [PATCH 1/3] saddle-points: sync tests expected results with problem-specifications and update example solution. --- exercises/saddle-points/example.py | 18 +++++++-------- exercises/saddle-points/saddle_points_test.py | 22 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/exercises/saddle-points/example.py b/exercises/saddle-points/example.py index 76cbaedb160..6d2af0cb46a 100644 --- a/exercises/saddle-points/example.py +++ b/exercises/saddle-points/example.py @@ -1,11 +1,11 @@ -def saddle_points(m): - if not m: - return set() - if any(len(r) != len(m[0]) for r in m): +def saddle_points(matrix): + if not matrix: + return [{}] + if any(len(row) != len(matrix[0]) for row in matrix): raise ValueError('irregular matrix') - mmax = [max(r) for r in m] - mmin = [min(c) for c in zip(*m)] - points = [(i+1, j+1) for i in range(len(m)) - for j in range(len(m[0])) if mmax[i] == mmin[j]] + mmax = [max(row) for row in matrix] + mmin = [min(col) for col in zip(*matrix)] + points = [{"row": index + 1, "column": col_index + 1} for index in range(len(matrix)) + for col_index in range(len(matrix[0])) if mmax[index] == mmin[col_index]] - return set(points) + return points or [{}] \ No newline at end of file diff --git a/exercises/saddle-points/saddle_points_test.py b/exercises/saddle-points/saddle_points_test.py index 636c5ec3883..71d1fa74afc 100644 --- a/exercises/saddle-points/saddle_points_test.py +++ b/exercises/saddle-points/saddle_points_test.py @@ -10,50 +10,50 @@ from saddle_points import saddle_points -# Tests adapted from `problem-specifications//canonical-data.json` @ v1.5.0 +# Tests adapted from `problem-specifications//canonical-data.json` @ v1.6.0 class SaddlePointsTest(unittest.TestCase): def test_identify_single_saddle_point(self): matrix = [[9, 8, 7], [5, 3, 2], [6, 6, 7]] - self.assertEqual(saddle_points(matrix), set([(2, 1)])) + self.assertEqual(saddle_points(matrix), [{"row": 2, "column": 1}]) def test_empty_matrix_has_no_saddle_points(self): - self.assertEqual(saddle_points([]), set()) + self.assertEqual(saddle_points([]), [dict()]) def test_matrix_with_one_elem_has_single_saddle_point(self): matrix = [[1]] - self.assertEqual(saddle_points(matrix), set([(1, 1)])) + self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 1}]) def test_identify_lack_of_saddle_points_when_there_are_none(self): matrix = [[1, 2, 3], [3, 1, 2], [2, 3, 1]] - self.assertEqual(saddle_points(matrix), set()) + self.assertEqual(saddle_points(matrix), [dict()]) def test_identify_multiple_saddle_points_in_column(self): matrix = [[4, 5, 4], [3, 5, 5], [1, 5, 4]] - expected = set([(1, 2), (2, 2), (3, 2)]) + expected = [{"row": 1, "column": 2}, {"row": 2, "column": 2}, {"row": 3, "column": 2}] self.assertEqual(saddle_points(matrix), expected) def test_identify_multiple_saddle_points_in_row(self): matrix = [[6, 7, 8], [5, 5, 5], [7, 5, 6]] - expected = set([(2, 1), (2, 2), (2, 3)]) + expected = [{"row": 2, "column": 1}, {"row": 2, "column": 2}, {"row": 2, "column": 3}] self.assertEqual(saddle_points(matrix), expected) def test_identify_saddle_point_in_bottom_right_corner(self): matrix = [[8, 7, 9], [6, 7, 6], [3, 2, 5]] - expected = set([(3, 3)]) + expected = [{"row": 3, "column": 3}] self.assertEqual(saddle_points(matrix), expected) def test_non_square_matrix_with_2_saddle_points(self): matrix = [[3, 1, 3], [3, 2, 4]] - self.assertEqual(saddle_points(matrix), set([(1, 3), (1, 1)])) + self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 1}, {"row": 1, "column": 3}]) def test_single_column_matrix_has_saddle_point_min_value(self): matrix = [[2], [1], [4], [1]] - self.assertEqual(saddle_points(matrix), set([(2, 1), (4, 1)])) + self.assertEqual(saddle_points(matrix), [{"row": 2, "column": 1}, {"row": 4, "column": 1}]) def test_single_row_matrix_has_saddle_point_in_max_value(self): matrix = [[2, 5, 3, 5]] - self.assertEqual(saddle_points(matrix), set([(1, 2), (1, 4)])) + self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 2}, {"row": 1, "column": 4}]) # Additional tests for this track From b4a4334d05d57d5bf12019056a73f200c3380561 Mon Sep 17 00:00:00 2001 From: Bethany Garcia Date: Wed, 22 May 2019 12:31:59 -0700 Subject: [PATCH 2/3] saddle-points: sync tests expected results with problem-specifications and update example solution. --- exercises/saddle-points/example.py | 8 +++++--- exercises/saddle-points/saddle_points_test.py | 15 ++++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/exercises/saddle-points/example.py b/exercises/saddle-points/example.py index 6d2af0cb46a..0a62e8d5454 100644 --- a/exercises/saddle-points/example.py +++ b/exercises/saddle-points/example.py @@ -5,7 +5,9 @@ def saddle_points(matrix): raise ValueError('irregular matrix') mmax = [max(row) for row in matrix] mmin = [min(col) for col in zip(*matrix)] - points = [{"row": index + 1, "column": col_index + 1} for index in range(len(matrix)) - for col_index in range(len(matrix[0])) if mmax[index] == mmin[col_index]] + points = [{"row": index + 1, "column": col_index + 1} + for index in range(len(matrix)) + for col_index in range(len(matrix[0])) + if mmax[index] == mmin[col_index]] - return points or [{}] \ No newline at end of file + return points or [{}] diff --git a/exercises/saddle-points/saddle_points_test.py b/exercises/saddle-points/saddle_points_test.py index 71d1fa74afc..b86b4faa8cd 100644 --- a/exercises/saddle-points/saddle_points_test.py +++ b/exercises/saddle-points/saddle_points_test.py @@ -30,12 +30,14 @@ def test_identify_lack_of_saddle_points_when_there_are_none(self): def test_identify_multiple_saddle_points_in_column(self): matrix = [[4, 5, 4], [3, 5, 5], [1, 5, 4]] - expected = [{"row": 1, "column": 2}, {"row": 2, "column": 2}, {"row": 3, "column": 2}] + expected = [{"row": 1, "column": 2}, {"row": 2, "column": 2}, + {"row": 3, "column": 2}] self.assertEqual(saddle_points(matrix), expected) def test_identify_multiple_saddle_points_in_row(self): matrix = [[6, 7, 8], [5, 5, 5], [7, 5, 6]] - expected = [{"row": 2, "column": 1}, {"row": 2, "column": 2}, {"row": 2, "column": 3}] + expected = [{"row": 2, "column": 1}, {"row": 2, "column": 2}, + {"row": 2, "column": 3}] self.assertEqual(saddle_points(matrix), expected) def test_identify_saddle_point_in_bottom_right_corner(self): @@ -45,15 +47,18 @@ def test_identify_saddle_point_in_bottom_right_corner(self): def test_non_square_matrix_with_2_saddle_points(self): matrix = [[3, 1, 3], [3, 2, 4]] - self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 1}, {"row": 1, "column": 3}]) + self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 1}, + {"row": 1, "column": 3}]) def test_single_column_matrix_has_saddle_point_min_value(self): matrix = [[2], [1], [4], [1]] - self.assertEqual(saddle_points(matrix), [{"row": 2, "column": 1}, {"row": 4, "column": 1}]) + self.assertEqual(saddle_points(matrix), [{"row": 2, "column": 1}, + {"row": 4, "column": 1}]) def test_single_row_matrix_has_saddle_point_in_max_value(self): matrix = [[2, 5, 3, 5]] - self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 2}, {"row": 1, "column": 4}]) + self.assertEqual(saddle_points(matrix), [{"row": 1, "column": 2}, + {"row": 1, "column": 4}]) # Additional tests for this track From 0670edf27fee63724d70c52cbb5bdc74871ac740 Mon Sep 17 00:00:00 2001 From: Bethany Garcia Date: Wed, 22 May 2019 19:49:15 -0700 Subject: [PATCH 3/3] Reverted cannonical-data.json version number to 1.5.0 to match problem-specification. --- exercises/saddle-points/saddle_points_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/saddle-points/saddle_points_test.py b/exercises/saddle-points/saddle_points_test.py index b86b4faa8cd..e99c73ff735 100644 --- a/exercises/saddle-points/saddle_points_test.py +++ b/exercises/saddle-points/saddle_points_test.py @@ -10,7 +10,7 @@ from saddle_points import saddle_points -# Tests adapted from `problem-specifications//canonical-data.json` @ v1.6.0 +# Tests adapted from `problem-specifications//canonical-data.json` @ v1.5.0 class SaddlePointsTest(unittest.TestCase): def test_identify_single_saddle_point(self):