Nix
/
BroSpeedTester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace median with mean, and use max value from the test

master
Nixellion 2020-07-18 04:23:54 +03:00
parent 4cfdcc309e
commit 0cbe5bb1e6
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
speedtester.py
View File

@ -6,7 +6,7 @@ from debug import setup_logging, catch_errors
log = logger = logging.getLogger("default") log = logger = logging.getLogger("default")
setup_logging() setup_logging()
# endregion # endregion
from statistics import median from statistics import mean
from threading import Thread from threading import Thread
from datetime import datetime from datetime import datetime
import speedtest import speedtest
@ -78,8 +78,8 @@ def generate_updown_plot_simple(downloads, uploads, name, description):
@catch_errors @catch_errors
def gather_day_median_data(dates, downloads, uploads): def gather_day_mean_data(dates, downloads, uploads):
log.debug("Gather day median data...") log.debug("Gather day mean data...")
dl = [] dl = []
up = [] up = []
@ -93,24 +93,24 @@ def gather_day_median_data(dates, downloads, uploads):
up[hour].append(uploads[i] if uploads[i] else 0) up[hour].append(uploads[i] if uploads[i] else 0)
for i, hour in enumerate(dl): for i, hour in enumerate(dl):
dl[i] = median(dl[i]) if len(dl[i]) > 0 else 0 dl[i] = mean(dl[i]) if len(dl[i]) > 0 else 0
for i, hour in enumerate(up): for i, hour in enumerate(up):
up[i] = median(up[i]) if len(up[i]) > 0 else 0 up[i] = mean(up[i]) if len(up[i]) > 0 else 0
return dl, up return dl, up
@catch_errors @catch_errors
def generate_day_median(dates, downloads, uploads): def generate_day_mean(dates, downloads, uploads):
dl, up = gather_day_median_data(dates, downloads, uploads) dl, up = gather_day_mean_data(dates, downloads, uploads)
generate_updown_plot_simple(dl, up, "day_median", "Day average") generate_updown_plot_simple(dl, up, "day_mean", "Day average")
@catch_errors @catch_errors
def generate_day_median_diff(dates, downloads, uploads): def generate_day_mean_diff(dates, downloads, uploads):
dl, up = gather_day_median_data(dates, downloads, uploads) dl, up = gather_day_mean_data(dates, downloads, uploads)
downs = [] downs = []
ups = [] ups = []
@ -123,7 +123,7 @@ def generate_day_median_diff(dates, downloads, uploads):
downs.append(dl[i]) downs.append(dl[i])
ups.append(up[i]) ups.append(up[i])
generate_updown_plot_simple(downs, ups, "day_median_diff", "Day average diff") generate_updown_plot_simple(downs, ups, "day_mean_diff", "Day average diff")
@catch_errors @catch_errors
@ -343,16 +343,16 @@ def threaded_wan_speed():
global wan_download global wan_download
global wan_upload global wan_upload
wan_download = median(downloads['total']) wan_download = max(downloads['total'])
wan_upload = median(uploads['total']) wan_upload = max(uploads['total'])
data_dict['wan_downloads'] = {} data_dict['wan_downloads'] = {}
data_dict['wan_uploads'] = {} data_dict['wan_uploads'] = {}
for key, value in downloads.items(): for key, value in downloads.items():
data_dict['wan_downloads'][key] = median(value) data_dict['wan_downloads'][key] = max(value)
for key, value in uploads.items(): for key, value in uploads.items():
data_dict['wan_uploads'][key] = median(value) data_dict['wan_uploads'][key] = max(value)
log.info(f"Monitor result: {mbits(wan_download)} mbps; {mbits(wan_upload)} mbps;") log.info(f"Monitor result: {mbits(wan_download)} mbps; {mbits(wan_upload)} mbps;")
@ -389,9 +389,9 @@ def generate_database_reports():
generate_plot_image(dates, downloads, uploads) generate_plot_image(dates, downloads, uploads)
generate_day_median(dates, downloads, uploads) generate_day_mean(dates, downloads, uploads)
generate_day_median_diff(dates, downloads, uploads) generate_day_mean_diff(dates, downloads, uploads)
generate_diff(dates, downloads, uploads) generate_diff(dates, downloads, uploads)