diff --git a/speedtester.py b/speedtester.py index 64dccbd..257c26c 100644 --- a/speedtester.py +++ b/speedtester.py @@ -107,6 +107,8 @@ def gather_day_mean_data(dates, downloads, uploads): return dl, up + + @catch_errors def generate_day_mean(dates, downloads, uploads): dl, up = gather_day_mean_data(dates, downloads, uploads) @@ -114,6 +116,8 @@ def generate_day_mean(dates, downloads, uploads): generate_updown_plot_simple(dl, up, "day_mean", "Day average") + + @catch_errors def generate_day_mean_diff(dates, downloads, uploads): dl, up = gather_day_mean_data(dates, downloads, uploads) @@ -131,6 +135,33 @@ def generate_day_mean_diff(dates, downloads, uploads): generate_updown_plot_simple(downs, ups, "day_mean_diff", "Day average diff") +@catch_errors +def gather_week_mean_data(dates, downloads, uploads): + dl = [] + up = [] + + for day in range(7): + dl.append([]) + up.append([]) + + for i, date in enumerate(dates): + day = date.weekday() + dl[day].append(downloads[i] if downloads[i] else 0) + up[day].append(uploads[i] if uploads[i] else 0) + + for i, day in enumerate(dl): + dl[i] = mean(dl[i]) if len(dl[i]) > 0 else 0 + + for i, day in enumerate(up): + up[i] = mean(up[i]) if len(up[i]) > 0 else 0 + + return dl, up + +@catch_errors +def generate_week_mean(dates, downloads, uploads): + dl, up = gather_week_mean_data(dates, downloads, uploads) + + generate_updown_plot_simple(dl, up, "week_mean", "Week average") @catch_errors def generate_txt_output(dates, downloads, uploads): @@ -408,11 +439,14 @@ def generate_database_reports(): generate_day_mean(dates, downloads, uploads) + generate_week_mean(dates, downloads, uploads) + generate_day_mean_diff(dates, downloads, uploads) generate_diff(dates, downloads, uploads) + import sys from netutils import test_intertnet_connection