From 65c7302f7500bd05c58f63d087a43833ef22a417 Mon Sep 17 00:00:00 2001 From: Cory Dean Chung Date: Sat, 12 Aug 2023 17:41:49 -0400 Subject: [PATCH] Checkpoint 2: I wrote functions for transform.py It went pretty well. In terms of writing the functions, I skimmed the instructions a bit too quickly, so I had to reread it to understand how to pull just the x- or y-coordinate in the last two functions. The discord was very helpful in figuring out what to do about the error I was getting when testing the clamp function, in that two people had already encountered the same error and provided a fix in the test file. --- test_transform.py | 18 +++++++++--------- transform.py | 38 ++++++++++++++++++++++++++++++-------- 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/test_transform.py b/test_transform.py index 8d46afe..9dd49b2 100644 --- a/test_transform.py +++ b/test_transform.py @@ -21,14 +21,14 @@ test(minimum, [[0, 1, 2, 3]], 0) test(minimum, [[-10, -20, -30]], -30) test(bounds, [[0, 1, 2, 3]], [0, 3]) test(bounds, [[-10, -20, -30]], [-30, -10]) -test(clamp, [[10, 0, 100]], 10) -test(clamp, [[-10, 0, 100]], 0) -test(clamp, [[104, 0, 100]], 100) -test(ratio, [[5, 0, 10]], 0.5) -test(ratio, [[167, 100, 200]], 0.67) -test(ratio, [[8, 10, 0]], 0.2) -test(ratio, [[4, 10, 20]], 0.0) -test(scale, [[4, 0, 10, 0, 100]], 40) -test(scale, [[180, 120, 240, 0, 100]], 50) +test(clamp, [10, 0, 100], 10) +test(clamp, [-10, 0, 100], 0) +test(clamp, [104, 0, 100], 100) +test(ratio, [5, 0, 10], 0.5) +test(ratio, [167, 100, 200], 0.67) +test(ratio, [8, 10, 0], 0.2) +test(ratio, [4, 10, 20], 0.0) +test(scale, [4, 0, 10, 0, 100], 40) +test(scale, [180, 120, 240, 0, 100], 50) test(get_x_values, [[[0, 5], [1, 5], [2, 5]]], [0, 1, 2]) test(get_y_values, [[[0, 5], [1, 5], [2, 5]]], [5, 5, 5]) diff --git a/transform.py b/transform.py index 64819b7..cb0199d 100644 --- a/transform.py +++ b/transform.py @@ -6,38 +6,60 @@ def maximum(data): "Returns the largest number in data" - raise NotImplementedError + maxNum = None + for number in data: + if maxNum is None: + maxNum = number + if maxNum < number: + maxNum = number + return maxNum def minimum(data): "Returns the smallest number in data" - raise NotImplementedError + minNum = None + for number in data: + if minNum is None: + minNum = number + if minNum > number: + minNum = number + return minNum def bounds(data): "Returns a list of the smallest and largest numbers in data" - raise NotImplementedError + return [minimum(data), maximum(data)] def clamp(value, low, high): """Clamps a value to a range from low to high. Returns value if it is between low and high. If value is lower than low, returns low. If value is higher than high, returns high. """ - raise NotImplementedError + if value < low: + return low + if value > high: + return high + return value def ratio(value, start, end): """Returns a number from 0.0 to 1.0, representing how far along value is from start to end. The return value is clamped to [0, 1], so even if value is lower than start, the return value will not be lower than 0.0. """ - raise NotImplementedError + return clamp((value - start)/(end - start), 0, 1) def scale(value, domain_min, domain_max, range_min, range_max): "Given a value within a domain, returns the scaled equivalent within range." - raise NotImplementedError + return range_min + ratio(value, domain_min, domain_max) * (range_max - range_min) def get_x_values(points): "Returns the first value for each point in points." - raise NotImplementedError + xcoordinates = [] + for xcoord,ycoord in points: + xcoordinates.append(xcoord) + return xcoordinates def get_y_values(points): "Returns the second value for each point in points." - raise NotImplementedError + ycoordinates = [] + for xcoord,ycoord in points: + ycoordinates.append(ycoord) + return ycoordinates \ No newline at end of file