From aa3d60997365da3bbc615a9e3a3e54b17163444b Mon Sep 17 00:00:00 2001 From: Justin Toombs Date: Thu, 3 Aug 2023 12:31:37 -0400 Subject: [PATCH] Various functions were written in regards to setting up the scatter plot functionality. For checkpoint 2, this was easily the most difficult task done thus far, and required a significant amount of hand-holding to get through. For the most part, anytime I got stuck, I had no idea how to proceed because I did not fully grasp what was being asked. I was able to achieve some head way with online forums, but for the most part needed to have one-on-one assistance. --- test_transform.py | 18 ++++++++--------- transform.py | 51 +++++++++++++++++++++++++++-------------------- 2 files changed, 38 insertions(+), 31 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..5ac0fc1 100644 --- a/transform.py +++ b/transform.py @@ -5,39 +5,46 @@ # None of them are finished; this is your job! def maximum(data): - "Returns the largest number in data" - raise NotImplementedError + highest = None + for number in data: + if highest is None: + highest = number + if number > highest: + highest = number + return highest def minimum(data): - "Returns the smallest number in data" - raise NotImplementedError + lowest = None + for number in data: + if lowest is None: + lowest = number + if number < lowest: + lowest = number + return lowest 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 + return maximum([low, minimum([value, high])]) 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 + unclamped_ratio=(value-start)/(end-start) + return clamp(unclamped_ratio, 0.0, 1.0) 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 + scale_ratio=ratio(value, domain_min, domain_max) + range_length = range_max - range_min + return range_min + scale_ratio * range_length def get_x_values(points): - "Returns the first value for each point in points." - raise NotImplementedError + x_values=[] + for x, y in points: + x_values.append(x) + return x_values def get_y_values(points): - "Returns the second value for each point in points." - raise NotImplementedError + y_values=[] + for x, y in points: + y_values.append(y) + return y_values