Changes goodput calculation.

This commit is contained in:
2023-01-12 09:43:42 +01:00
parent 86285146ab
commit 0f67ef76a8

View File

@@ -147,14 +147,14 @@ if __name__ == "__main__":
print(transmission_df) print(transmission_df)
range_start_time = transmission_df["datetime"].min() range_start_time = transmission_df.index.min()
range_sum_interval = "{}s".format(args.interval) range_sum_interval = "{}s".format(args.interval)
# create timedelta range with maximum timedelta # create timedelta range with maximum timedelta
time_range = pd.timedelta_range(pd.Timedelta(range_start_time), transmission_df["datetime"].max(), freq=range_sum_interval) time_range = pd.timedelta_range(pd.Timedelta(range_start_time), transmission_df.index.max(), freq=range_sum_interval)
# create bins by pd.cut, aggregate sum # create bins by pd.cut, aggregate sum
transmission_df = transmission_df.groupby(pd.cut(transmission_df["datetime"], bins=time_range, labels=time_range[:-1]))["goodput"].sum().reset_index() transmission_df = transmission_df.groupby(pd.cut(transmission_df.index, bins=time_range, labels=time_range[:-1]))["goodput"].sum().reset_index()
#transmission_df["goodput"] = transmission_df["payload_size"].rolling("{}s".format(args.interval)).sum() #transmission_df["goodput"] = transmission_df["payload_size"].rolling("{}s".format(args.interval)).sum()
transmission_df["goodput"] = transmission_df["goodput"].apply( transmission_df["goodput"] = transmission_df["goodput"].apply(
lambda x: ((x * 8) / args.interval) / 10**6 lambda x: ((x * 8) / args.interval) / 10**6