From 7eda3ed57a3f33fa922efe8e1085576fde4a2d66 Mon Sep 17 00:00:00 2001 From: Bethany Garcia Date: Sat, 25 May 2019 11:37:35 -0700 Subject: [PATCH 1/4] difference-of-squares: sync expected test results and input data with problem-specifications. --- .../difference_of_squares_test.py | 9 +++++---- exercises/difference-of-squares/example.py | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/exercises/difference-of-squares/difference_of_squares_test.py b/exercises/difference-of-squares/difference_of_squares_test.py index 8c87403625..204c416975 100644 --- a/exercises/difference-of-squares/difference_of_squares_test.py +++ b/exercises/difference-of-squares/difference_of_squares_test.py @@ -1,6 +1,7 @@ import unittest -from difference_of_squares import difference, square_of_sum, sum_of_squares +from difference_of_squares import difference_of_squares, \ + square_of_sum, sum_of_squares # Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0 @@ -25,13 +26,13 @@ def test_sum_of_squares_100(self): self.assertEqual(sum_of_squares(100), 338350) def test_difference_of_squares_1(self): - self.assertEqual(difference(1), 0) + self.assertEqual(difference_of_squares(1), 0) def test_difference_of_squares_5(self): - self.assertEqual(difference(5), 170) + self.assertEqual(difference_of_squares(5), 170) def test_difference_of_squares_100(self): - self.assertEqual(difference(100), 25164150) + self.assertEqual(difference_of_squares(100), 25164150) if __name__ == '__main__': diff --git a/exercises/difference-of-squares/example.py b/exercises/difference-of-squares/example.py index 89c6a0ea25..e17c018f44 100644 --- a/exercises/difference-of-squares/example.py +++ b/exercises/difference-of-squares/example.py @@ -1,11 +1,12 @@ -def square_of_sum(count): - sum_ = count * (count + 1) / 2 +def square_of_sum(number): + sum_ = number * (number + 1) / 2 return sum_ * sum_ -def sum_of_squares(count): - return sum(m * m for m in range(count + 1)) +def sum_of_squares(number): + numerator = number * (number + 1) * (2 * number + 1) + return numerator/6 -def difference(count): - return square_of_sum(count) - sum_of_squares(count) +def difference_of_squares(number): + return square_of_sum(number) - sum_of_squares(number) From c26d7c2b8ab9d9031219acb0612baee879f4e767 Mon Sep 17 00:00:00 2001 From: Bethany Garcia Date: Sat, 25 May 2019 11:45:19 -0700 Subject: [PATCH 2/4] Changed argument name to number from count. --- exercises/difference-of-squares/difference_of_squares.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exercises/difference-of-squares/difference_of_squares.py b/exercises/difference-of-squares/difference_of_squares.py index e5f44fc767..9c99b829d5 100644 --- a/exercises/difference-of-squares/difference_of_squares.py +++ b/exercises/difference-of-squares/difference_of_squares.py @@ -1,10 +1,10 @@ -def square_of_sum(count): +def square_of_sum(number): pass -def sum_of_squares(count): +def sum_of_squares(number): pass -def difference(count): +def difference(number): pass From b48a8b4fe36cadf358867a8af6ca60877cac4455 Mon Sep 17 00:00:00 2001 From: Bethany Garcia Date: Thu, 30 May 2019 09:32:49 -0700 Subject: [PATCH 3/4] difference of squares: formatted import statements in tests to meet coding standards. Also corrected mis-named function in exercise stub. --- exercises/difference-of-squares/difference_of_squares.py | 2 +- .../difference-of-squares/difference_of_squares_test.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/exercises/difference-of-squares/difference_of_squares.py b/exercises/difference-of-squares/difference_of_squares.py index 9c99b829d5..2b2ec94480 100644 --- a/exercises/difference-of-squares/difference_of_squares.py +++ b/exercises/difference-of-squares/difference_of_squares.py @@ -6,5 +6,5 @@ def sum_of_squares(number): pass -def difference(number): +def difference_of_squares(number): pass diff --git a/exercises/difference-of-squares/difference_of_squares_test.py b/exercises/difference-of-squares/difference_of_squares_test.py index 204c416975..1020f8d283 100644 --- a/exercises/difference-of-squares/difference_of_squares_test.py +++ b/exercises/difference-of-squares/difference_of_squares_test.py @@ -1,7 +1,10 @@ import unittest -from difference_of_squares import difference_of_squares, \ - square_of_sum, sum_of_squares +from difference_of_squares import ( + difference_of_squares, + square_of_sum, + sum_of_squares +) # Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0 From 3ebfb01b1215ef386420fac6491f894e37b8bd11 Mon Sep 17 00:00:00 2001 From: BethanyG Date: Fri, 31 May 2019 10:10:06 -0700 Subject: [PATCH 4/4] Update exercises/difference-of-squares/example.py Co-Authored-By: Corey McCandless --- exercises/difference-of-squares/example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercises/difference-of-squares/example.py b/exercises/difference-of-squares/example.py index e17c018f44..5879a75a96 100644 --- a/exercises/difference-of-squares/example.py +++ b/exercises/difference-of-squares/example.py @@ -5,7 +5,7 @@ def square_of_sum(number): def sum_of_squares(number): numerator = number * (number + 1) * (2 * number + 1) - return numerator/6 + return numerator / 6 def difference_of_squares(number):