diff --git a/scatterplot.py b/scatterplot.py index 50f66fb..afd7df1 100644 --- a/scatterplot.py +++ b/scatterplot.py @@ -34,10 +34,10 @@ def draw_scatterplot(data, size=5, color="black"): draw_points(data, color, size) def draw_axes(data): - "Draws the scatter plot's axes." + def draw_points(data, color, size): - "Draws the scatter plot's points." + with no_delay(): data = generate_data(50, 10, 500, 5, 400, 1000) diff --git a/transform.py b/transform.py index 667e526..1997375 100644 --- a/transform.py +++ b/transform.py @@ -5,82 +5,35 @@ # None of them are finished; this is your job! def maximum(data): - def minimum(data): highest = None for number in data: if highest is None: - highest = 10 - if number < lowest: highest = number + if number > highest: + highest = number return highest - + def minimum(data): - def minimum(data): lowest = None for number in data: if lowest is None: - lowest = 5 + lowest = number if number < lowest: lowest = number return lowest def bounds(data): - def minimum(data): - lowest = None - for number in data: - if lowest is None: - lowest = number - if number < lowest: - lowest = number - return lowest + return [minimum] def clamp(value, low, high): - def minimum(data): - lowest = None - for number in data: - if lowest is None: - lowest = number - if number < lowest: - lowest = number - return lowest + def ratio(value, start, end): - def minimum(data): - lowest = None - for number in data: - if lowest is None: - lowest = number - if number < lowest: - lowest = number - return lowest + def scale(value, domain_min, domain_max, range_min, range_max): - def minimum(data): - lowest = None - for number in data: - if lowest is None: - lowest = number - if number < lowest: - lowest = number - return lowest - -def get_x_values(points): - def minimum(data): - lowest = None - for number in data: - if lowest is None: - lowest = number - if number < lowest: - lowest = number - return lowest - + + def get_y_values(points): - def minimum(data): - lowest = None - for number in data: - if lowest is None: - lowest = number - if number < lowest: - lowest = number - return lowest +