Changes to bandwidth calculation.

plot_single_transmission_EM9190.py

@@ -42,7 +42,9 @@ def convert_cellid(value):
 if __name__ == "__main__":
     parser = ArgumentParser()
     parser.add_argument("-s", "--serial_file", required=True, help="Serial csv file.")
-    parser.add_argument("-p", "--pcap_csv_folder", required=True, help="PCAP csv folder.")
+    parser.add_argument(
+        "-p", "--pcap_csv_folder", required=True, help="PCAP csv folder."
+    )
     parser.add_argument("--save", required=True, help="Location to save pdf file.")
     parser.add_argument(
         "-i",
@@ -66,8 +68,11 @@ if __name__ == "__main__":
     pcap_csv_list.sort(key=lambda x: int(x.split("_")[-1].replace(".csv", "")))
 
     for csv in pcap_csv_list:
-
+        print(
-        print("\rProcessing {} out of {} CSVs.\t({}%)\t".format(counter, len(pcap_csv_list), math.floor(counter/len(pcap_csv_list))))
+            "\rProcessing {} out of {} CSVs.\t({}%)\t".format(
+                counter, len(pcap_csv_list), math.floor(counter / len(pcap_csv_list))
+            )
+        )
 
         # try:
         transmission_df = pd.read_csv(
@@ -75,7 +80,9 @@ if __name__ == "__main__":
             dtype=dict(is_retranmission=bool, is_dup_ack=bool),
         )
 
-        transmission_df["datetime"] = pd.to_datetime(transmission_df["datetime"]) - pd.Timedelta(hours=1)
+        transmission_df["datetime"] = pd.to_datetime(
+            transmission_df["datetime"]
+        ) - pd.Timedelta(hours=1)
         transmission_df = transmission_df.set_index("datetime")
         transmission_df.index = pd.to_datetime(transmission_df.index)
         transmission_df = transmission_df.sort_index()
@@ -84,12 +91,18 @@ if __name__ == "__main__":
         transmission_df["srtt"] = transmission_df["srtt"].apply(lambda x: x / 10**6)
 
         # key for columns and level for index
-        transmission_df["goodput"] = transmission_df["payload_size"].groupby(pd.Grouper(level="datetime", freq="{}s".format(args.interval))).transform("sum")
+        transmission_df["goodput"] = (
+            transmission_df["payload_size"]
+            .groupby(pd.Grouper(level="datetime", freq="{}s".format(args.interval)))
+            .transform("sum")
+        )
         transmission_df["goodput"] = transmission_df["goodput"].apply(
             lambda x: ((x * 8) / args.interval) / 10**6
         )
 
-        transmission_df["goodput_rolling"] = transmission_df["payload_size"].rolling("{}s".format(args.interval)).sum()
+        transmission_df["goodput_rolling"] = (
+            transmission_df["payload_size"].rolling("{}s".format(args.interval)).sum()
+        )
         transmission_df["goodput_rolling"] = transmission_df["goodput_rolling"].apply(
             lambda x: ((x * 8) / args.interval) / 10**6
         )
@@ -102,8 +115,12 @@ if __name__ == "__main__":
         # transmission_df = transmission_df.filter(["goodput", "datetime", "ack_rtt", "goodput_rolling", "snd_cwnd"])
 
         # read serial csv
-        serial_df = pd.read_csv(args.serial_file, converters={"Cell_ID": convert_cellid})
+        serial_df = pd.read_csv(
-        serial_df["datetime"] = pd.to_datetime(serial_df["datetime"]) - pd.Timedelta(hours=1)
+            args.serial_file, converters={"Cell_ID": convert_cellid}
+        )
+        serial_df["datetime"] = pd.to_datetime(serial_df["datetime"]) - pd.Timedelta(
+            hours=1
+        )
         serial_df = serial_df.set_index("datetime")
         serial_df.index = pd.to_datetime(serial_df.index)
         serial_df.sort_index()
@@ -124,12 +141,39 @@ if __name__ == "__main__":
         transmission_df.index = transmission_df["arrival_time"]
 
         # replace 0 in RSRQ with Nan
-        transmission_df["NR5G_RSRQ_(dB)"] = transmission_df["NR5G_RSRQ_(dB)"].replace(0, np.NaN)
+        transmission_df["NR5G_RSRQ_(dB)"] = transmission_df["NR5G_RSRQ_(dB)"].replace(
+            0, np.NaN
+        )
         transmission_df["RSRQ_(dB)"] = transmission_df["RSRQ_(dB)"].replace(0, np.NaN)
         # stacked plot for bandwidth
-        transmission_df["lte_bw_sum"] = transmission_df["bw_sum"] - transmission_df["NR5G_dl_bw"]
+        # transmission_df["lte_bw_sum"] = transmission_df["bw_sum"] - transmission_df["NR5G_dl_bw"]
-        transmission_df["nr_bw_sum"] = transmission_df["NR5G_dl_bw"]
+        # transmission_df["nr_bw_sum"] = transmission_df["NR5G_dl_bw"]
 
+        for i in range(1, 5):
+            transmission_df["LTE_SCC{}_effective_bw".format(i)] = transmission_df[
+                "LTE_SCC{}_bw".format(i)
+            ]
+
+            mask = transmission_df["LTE_SCC{}_state".format(i)].isin(["ACTIVE"])
+            transmission_df["LTE_SCC{}_effective_bw".format(i)] = transmission_df[
+                "LTE_SCC{}_effective_bw".format(i)
+            ].where(mask, other=0)
+
+            # df = df.filter(["LTE_SCC1_state", "LTE_SCC1_bw", "LTE_SCC1_effective_bw"])
+        transmission_df["SCC1_NR5G_effective_bw"] = transmission_df[
+            "SCC1_NR5G_bw"
+        ].fillna(0)
+        transmission_df["effective_bw_sum"] = (
+            transmission_df["SCC1_NR5G_effective_bw"]
+            + transmission_df["LTE_SCC1_effective_bw"]
+            + transmission_df["LTE_SCC2_effective_bw"]
+            + transmission_df["LTE_SCC3_effective_bw"]
+            + transmission_df["LTE_SCC4_effective_bw"]
+            + transmission_df["LTE_bw"]
+        )
+
+        transmission_df["lte_effective_bw_sum"] = transmission_df["effective_bw_sum"] - transmission_df["SCC1_NR5G_effective_bw"]
+        transmission_df["nr_effective_bw_sum"] = transmission_df["SCC1_NR5G_effective_bw"]
 
         # transmission timeline
         scaley = 1.5
@@ -153,30 +197,67 @@ if __name__ == "__main__":
         for index, value in lte_handovers.items():
             if value > 0:
                 if first:
-                    ax00.axvline(index, ymin=0, ymax=1, color="skyblue", label="4G Handover")
+                    ax00.axvline(
+                        index, ymin=0, ymax=1, color="skyblue", label="4G Handover"
+                    )
                     first = False
                 else:
                     ax00.axvline(index, ymin=0, ymax=1, color="skyblue")
 
         first = True
-        nr_handovers = transmission_df["NR5G_Cell_ID"].replace(0, np.NaN).dropna().diff()
+        nr_handovers = (
+            transmission_df["NR5G_Cell_ID"].replace(0, np.NaN).dropna().diff()
+        )
         for index, value in nr_handovers.items():
             if value > 0:
                 if first:
-                    ax00.axvline(index, ymin=0, ymax=1, color="greenyellow", label="5G Handover")
+                    ax00.axvline(
+                        index, ymin=0, ymax=1, color="greenyellow", label="5G Handover"
+                    )
                     first = False
                 else:
                     ax00.axvline(index, ymin=0, ymax=1, color="greenyellow")
 
-
+        ax0.plot(
-        ax0.plot(transmission_df["snd_cwnd"].dropna(), color="lime", linestyle="dashed", label="cwnd")
+            transmission_df["snd_cwnd"].dropna(),
-        ax1.plot(transmission_df["srtt"].dropna(), color="red", linestyle="dashdot", label="sRTT")
+            color="lime",
-        ax2.plot(transmission_df["goodput_rolling"], color="blue", linestyle="solid", label="goodput")
+            linestyle="dashed",
+            label="cwnd",
+        )
+        ax1.plot(
+            transmission_df["srtt"].dropna(),
+            color="red",
+            linestyle="dashdot",
+            label="sRTT",
+        )
+        ax2.plot(
+            transmission_df["goodput_rolling"],
+            color="blue",
+            linestyle="solid",
+            label="goodput",
+        )
         # ax2.plot(transmission_df["goodput"], color="blue", linestyle="solid", label="goodput")
 
-        ax01.plot(transmission_df["bw_sum"].dropna(), color="peru", linestyle="solid", label="bandwidth")
+        ax01.plot(
-        ax01.plot(transmission_df["lte_bw_sum"].dropna(), color="lightsteelblue", linestyle="solid", label="4G bandwidth", alpha=.5)
+            transmission_df["effective_bw_sum"].dropna(),
-        ax01.plot(transmission_df["nr_bw_sum"].dropna(), color="cornflowerblue", linestyle="solid",label="5G bandwidth", alpha=.5)
+            color="peru",
+            linestyle="solid",
+            label="bandwidth",
+        )
+        ax01.plot(
+            transmission_df["lte_effective_bw_sum"].dropna(),
+            color="lightsteelblue",
+            linestyle="solid",
+            label="4G bandwidth",
+            alpha=0.5,
+        )
+        ax01.plot(
+            transmission_df["nr_effective_bw_sum"].dropna(),
+            color="cornflowerblue",
+            linestyle="solid",
+            label="5G bandwidth",
+            alpha=0.5,
+        )
 
         # ax01.stackplot(transmission_df["arrival_time"].to_list(),
         #               [transmission_df["lte_bw_sum"].to_list(), transmission_df["nr_bw_sum"].to_list()],
@@ -184,8 +265,18 @@ if __name__ == "__main__":
         #               labels=["4G bandwidth", "5G bandwidth"]
         #               )
 
-        ax02.plot(transmission_df["RSRQ_(dB)"].dropna(), color="purple", linestyle="dotted", label="LTE RSRQ")
+        ax02.plot(
-        ax00.plot(transmission_df["NR5G_RSRQ_(dB)"].dropna(), color="magenta", linestyle="dotted", label="NR RSRQ")
+            transmission_df["RSRQ_(dB)"].dropna(),
+            color="purple",
+            linestyle="dotted",
+            label="LTE RSRQ",
+        )
+        ax00.plot(
+            transmission_df["NR5G_RSRQ_(dB)"].dropna(),
+            color="magenta",
+            linestyle="dotted",
+            label="NR RSRQ",
+        )
 
         ax2.spines.right.set_position(("axes", 1.1))
         ax02.spines.right.set_position(("axes", 1.1))