From 845d471185ce88dd565a5c500444a8b30aef6476 Mon Sep 17 00:00:00 2001 From: trackingv2 Date: Fri, 20 Aug 2021 00:08:03 +0200 Subject: [PATCH] Update source --- plotter.py | 4 ++-- plotter2.py | 4 ++-- trackingv2.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plotter.py b/plotter.py index ed231b3..bcf6d42 100644 --- a/plotter.py +++ b/plotter.py @@ -6,12 +6,12 @@ import matplotlib.pyplot as plt from shutil import copyfile x_axis='datetime' -y_axes=['v2','nonv2'] +y_axes=['v2','nonv2','all'] df = pd.read_csv("/home/trackingv2/trackingv2.csv") filter = [x_axis] + y_axes title = "Tracking how many Tor HSDirs run a version that is non-v2" -df[filter].plot(kind="line", x=x_axis, title=title, grid=True, rot=20, figsize=(6,5)) +df[filter].plot.line(x=x_axis, title=title, grid=True, rot=20, figsize=(6,5)) plt.savefig("/var/www/data/plot.png") copyfile("/home/trackingv2/trackingv2.csv", "/var/www/data/v2.csv") diff --git a/plotter2.py b/plotter2.py index aac2854..2c51834 100644 --- a/plotter2.py +++ b/plotter2.py @@ -13,9 +13,9 @@ with open("/home/trackingv2/trackingv2.csv", "r") as f: writer = csv.writer(write) writer.writerow(["fraction_nonv2", "datetime"]) for row in reader: - per = int(row[1]) / (int(row[0])+int(row[1])) + per = int(row[1]) / int(row[2]) per = round(per, 4) - writer.writerow([per, row[2]]) + writer.writerow([per, row[3]]) x_axis='datetime' y_axis='fraction_nonv2' diff --git a/trackingv2.py b/trackingv2.py index 754e15e..42f72bb 100644 --- a/trackingv2.py +++ b/trackingv2.py @@ -38,7 +38,7 @@ while True: dt = datetime.datetime.utcnow().strftime("%Y/%m/%d %H") with open("/home/trackingv2/trackingv2.csv", "a") as csvFile: - csvFile.write("{},{},{}\n".format(numberOfv2, numberOfNonv2,dt)) + csvFile.write("{},{},{},{}\n".format(numberOfv2, numberOfNonv2, numberOfHSDir, dt)) #print("Num HSDir: {}".format(numberOfHSDir)) #print("< 0.4.6: {}".format(numberOfv2))