From 50afb7e4e9890ec3c514ec04e9842f9b88a9218c Mon Sep 17 00:00:00 2001 From: Lukas Prause Date: Tue, 28 Feb 2023 15:54:30 +0100 Subject: [PATCH] Adds compare between multiple folders --- cdf_compare.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/cdf_compare.py b/cdf_compare.py index 2a0c99d..e07ec34 100755 --- a/cdf_compare.py +++ b/cdf_compare.py @@ -69,10 +69,8 @@ def plot_cdf(dataframe, column_name, axis=None): if __name__ == "__main__": parser = ArgumentParser() - parser.add_argument("--serial1", required=True, help="Serial csv file1.") - parser.add_argument("--serial2", required=True, help="Serial csv file2.") - parser.add_argument("--folder1", required=True, help="PCAP csv folder1.") - parser.add_argument("--folder2", required=True, help="PCAP csv folder2.") + parser.add_argument("-s", "--serials", required=True, help="Serial csv files. Comma separated.") + parser.add_argument("-f", "--folders", required=True, help="PCAP csv folders. Comma separated.") parser.add_argument("--save", default=None, help="Location to save pdf file.") parser.add_argument( "-c", @@ -92,7 +90,7 @@ if __name__ == "__main__": args = parser.parse_args() transmission_df_list = list() - for f in [args.folder1, args.folder2]: + for f in args.folders.split(","): manager = multiprocessing.Manager() n = manager.Value("i", 0) frame_list = manager.list() @@ -189,22 +187,28 @@ if __name__ == "__main__": )) # Plot sRTT CDF + legend = list() plot_cdf(transmission_df_list[0]["df"], "srtt") - plot_cdf(transmission_df_list[1]["df"], "srtt", axis=plt.gca()) + for i in range(1, len(transmission_df_list)): + plot_cdf(transmission_df_list[i]["df"], "srtt", axis=plt.gca()) + legend.append(transmission_df_list[i]["cc_algo"]) plt.xscale("log") plt.xlabel("sRTT [s]") plt.ylabel("CDF") - plt.legend([transmission_df_list[0]["cc_algo"], transmission_df_list[1]["cc_algo"]]) - plt.title("{}".format(transmission_direction)) + plt.legend(legend) + plt.title("{}".format(transmission_df_list[0]["transmission_direction"])) plt.savefig("{}{}_cdf_compare_plot.pdf".format(args.save, "srtt")) plt.clf() # Plot goodput CDF + legend = list() plot_cdf(transmission_df_list[0]["df"], "goodput") - plot_cdf(transmission_df_list[1]["df"], "goodput", axis=plt.gca()) + for i in range(1, len(transmission_df_list)): + plot_cdf(transmission_df_list[i]["df"], "goodput", axis=plt.gca()) + legend.append(transmission_df_list[i]["cc_algo"]) plt.xlabel("goodput [mbps]") plt.ylabel("CDF") - plt.legend([transmission_df_list[0]["cc_algo"], transmission_df_list[1]["cc_algo"]]) - plt.title("{}".format(transmission_direction)) + plt.legend(legend) + plt.title("{}".format(transmission_df_list[0]["transmission_direction"])) plt.savefig("{}{}_cdf_compare_plot.pdf".format(args.save, "goodput")) \ No newline at end of file