diff --git a/plot_single_transmission_paper.py b/plot_single_transmission_paper.py index 6e6dcaf..5d65f90 100755 --- a/plot_single_transmission_paper.py +++ b/plot_single_transmission_paper.py @@ -148,20 +148,24 @@ if __name__ == "__main__": ].where(mask, other=0) # sum all effective bandwidth for 5G and 4G - serial_df["SCC1_NR5G_effective_bw"] = serial_df[ - "SCC1_NR5G_bw" - ].fillna(0) + serial_df["SCC1_NR5G_effective_bw"] = serial_df["SCC1_NR5G_bw"].fillna(0) + serial_df["effective_bw_sum"] = ( + serial_df["SCC1_NR5G_effective_bw"] + + serial_df["LTE_SCC1_effective_bw"] + + serial_df["LTE_SCC2_effective_bw"] + + serial_df["LTE_SCC3_effective_bw"] + + serial_df["LTE_SCC4_effective_bw"] + + serial_df["LTE_bw"] + ) + bw_cols = [ + "SCC1_NR5G_effective_bw", + "LTE_bw", + "LTE_SCC1_effective_bw", + "LTE_SCC2_effective_bw", + "LTE_SCC3_effective_bw", + "LTE_SCC4_effective_bw", + ] - serial_df["lte_effective_bw_sum"] = ( - serial_df["LTE_SCC1_effective_bw"].fillna(0) - + serial_df["LTE_SCC2_effective_bw"].fillna(0) - + serial_df["LTE_SCC3_effective_bw"].fillna(0) - + serial_df["LTE_SCC4_effective_bw"].fillna(0) - + serial_df["LTE_bw"].fillna(0)) - serial_df["nr_effective_bw_sum"] = serial_df["SCC1_NR5G_effective_bw"] - - serial_df["effective_bw_sum"] = serial_df["nr_effective_bw_sum"] + serial_df[ - "lte_effective_bw_sum"] # transmission timeline scaley = 1.5 @@ -197,25 +201,6 @@ if __name__ == "__main__": label="goodput", ) - # sum all effective bandwidth for 5G and 4G - serial_df["SCC1_NR5G_effective_bw"] = serial_df["SCC1_NR5G_bw"].fillna(0) - serial_df["effective_bw_sum"] = ( - serial_df["SCC1_NR5G_effective_bw"] - + serial_df["LTE_SCC1_effective_bw"] - + serial_df["LTE_SCC2_effective_bw"] - + serial_df["LTE_SCC3_effective_bw"] - + serial_df["LTE_SCC4_effective_bw"] - + serial_df["LTE_bw"] - ) - bw_cols = [ - "SCC1_NR5G_effective_bw", - "LTE_bw", - "LTE_SCC1_effective_bw", - "LTE_SCC2_effective_bw", - "LTE_SCC3_effective_bw", - "LTE_SCC4_effective_bw", - ] - serial_df["time_rel"] = serial_df["time"] - serial_df["time"].iloc[0] serial_df.index = serial_df["time_rel"] / 60