From 8ae2b11425a856185284f6cd8513fab71ce4637f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 28 Dec 2024 20:05:42 -0300
Subject: [PATCH] Fix
---
.../cap_conf_1/cap_conf_description.txt | 3 ++
.../cap_conf_1}/ue1/job_1.txt | 0
.../cap_conf_1}/ue2/job_1.txt | 0
.../no_slicing/scenario_description.txt | 3 ++
.../cap_conf_1/cap_conf_description.txt | 3 ++
.../cap_conf_1/scenario_description.txt | 1 -
.../cap_conf_2/cap_conf_description.txt | 3 ++
.../cap_conf_2/scenario_description.txt | 1 -
.../cap_conf_3/cap_conf_description.txt | 3 ++
.../cap_conf_3/scenario_description.txt | 1 -
.../cap_conf_4/cap_conf_description.txt | 3 ++
.../cap_conf_4/scenario_description.txt | 1 -
.../medicoes/scen_01/scenario_description.txt | 3 ++
.../cap_conf_1/cap_conf_description.txt | 3 ++
.../cap_conf_1/scenario_description.txt | 1 -
.../cap_conf_2/cap_conf_description.txt | 3 ++
.../cap_conf_2/scenario_description.txt | 1 -
.../cap_conf_3/cap_conf_description.txt | 3 ++
.../cap_conf_3/scenario_description.txt | 1 -
.../cap_conf_4/cap_conf_description.txt | 3 ++
.../cap_conf_4/scenario_description.txt | 1 -
.../medicoes/scen_02/scenario_description.txt | 3 ++
.../cap_conf_1/cap_conf_description.txt | 3 ++
.../cap_conf_1/scenario_description.txt | 1 -
.../cap_conf_2/cap_conf_description.txt | 3 ++
.../cap_conf_2/scenario_description.txt | 1 -
.../cap_conf_3/cap_conf_description.txt | 3 ++
.../cap_conf_3/scenario_description.txt | 1 -
.../cap_conf_4/cap_conf_description.txt | 3 ++
.../cap_conf_4/scenario_description.txt | 1 -
.../cap_conf_5/cap_conf_description.txt | 3 ++
.../cap_conf_5/scenario_description.txt | 1 -
.../cap_conf_6/cap_conf_description.txt | 3 ++
.../cap_conf_6/scenario_description.txt | 1 -
.../cap_conf_7/cap_conf_description.txt | 3 ++
.../cap_conf_7/scenario_description.txt | 1 -
.../medicoes/scen_03/scenario_description.txt | 3 ++
.../medicoes/script_plot_mestrado.py | 28 +++++++++----------
38 files changed, 74 insertions(+), 29 deletions(-)
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/cap_conf_description.txt
rename openairinterface5g/carlos_mestrado/medicoes/{scen_01/no_slicing => no_slicing/cap_conf_1}/ue1/job_1.txt (100%)
rename openairinterface5g/carlos_mestrado/medicoes/{scen_01/no_slicing => no_slicing/cap_conf_1}/ue2/job_1.txt (100%)
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/no_slicing/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_01/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_02/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/cap_conf_description.txt
delete mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/scenario_description.txt
create mode 100644 openairinterface5g/carlos_mestrado/medicoes/scen_03/scenario_description.txt
diff --git a/openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/cap_conf_description.txt
new file mode 100644
index 00000000..bed7fd9e
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: -
+UE1_slice: -
+UE2_slice: -
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/no_slicing/ue1/job_1.txt b/openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/ue1/job_1.txt
similarity index 100%
rename from openairinterface5g/carlos_mestrado/medicoes/scen_01/no_slicing/ue1/job_1.txt
rename to openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/ue1/job_1.txt
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/no_slicing/ue2/job_1.txt b/openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/ue2/job_1.txt
similarity index 100%
rename from openairinterface5g/carlos_mestrado/medicoes/scen_01/no_slicing/ue2/job_1.txt
rename to openairinterface5g/carlos_mestrado/medicoes/no_slicing/cap_conf_1/ue2/job_1.txt
diff --git a/openairinterface5g/carlos_mestrado/medicoes/no_slicing/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/no_slicing/scenario_description.txt
new file mode 100644
index 00000000..70d18fc9
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/no_slicing/scenario_description.txt
@@ -0,0 +1,3 @@
+description: This scenario used iperf bandwidths for each UE, with UE1 set to 120 Mbps and UE2 set to 120 Mbps.
+UE1_bandwidth: 120
+UE2_bandwidth: 120
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/cap_conf_description.txt
new file mode 100644
index 00000000..dbeb6a21
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 20% of the radio resources, while Slice 2 (UE2) had 80%.
+UE1_slice: 20
+UE2_slice: 80
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/scenario_description.txt
deleted file mode 100644
index a6d55a8c..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_1/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 120 Mbps for both UEs, and slice 1 (ue) had 20% of the radio resources, while slice 2 (ue 2) had 80%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/cap_conf_description.txt
new file mode 100644
index 00000000..a15b7366
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 30% of the radio resources, while Slice 2 (UE2) had 70%.
+UE1_slice: 30
+UE2_slice: 70
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/scenario_description.txt
deleted file mode 100644
index fb7df515..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_2/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 120 Mbps for both UEs, and slice 1 (ue) had 30% of the radio resources, while slice 2 (ue 2) had 70%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/cap_conf_description.txt
new file mode 100644
index 00000000..41097150
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 40% of the radio resources, while Slice 2 (UE2) had 60%.
+UE1_slice: 40
+UE2_slice: 60
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/scenario_description.txt
deleted file mode 100644
index 72b0512d..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_3/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 120 Mbps for both UEs, and slice 1 (ue) had 40% of the radio resources, while slice 2 (ue 2) had 60%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/cap_conf_description.txt
new file mode 100644
index 00000000..4ebdd863
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 50% of the radio resources, while Slice 2 (UE2) had 50%.
+UE1_slice: 50
+UE2_slice: 50
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/scenario_description.txt
deleted file mode 100644
index dacc6664..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_01/cap_conf_4/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 120 Mbps for both UEs, and slice 1 (ue) had 50% of the radio resources, while slice 2 (ue 2) had 50%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_01/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_01/scenario_description.txt
new file mode 100644
index 00000000..70d18fc9
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_01/scenario_description.txt
@@ -0,0 +1,3 @@
+description: This scenario used iperf bandwidths for each UE, with UE1 set to 120 Mbps and UE2 set to 120 Mbps.
+UE1_bandwidth: 120
+UE2_bandwidth: 120
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/cap_conf_description.txt
new file mode 100644
index 00000000..dbeb6a21
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 20% of the radio resources, while Slice 2 (UE2) had 80%.
+UE1_slice: 20
+UE2_slice: 80
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/scenario_description.txt
deleted file mode 100644
index 9d1c8a0e..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_1/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 10 M (ue1) 60M (ue2), and slice 1 (ue) had 20% of the radio resources, while slice 2 (ue 2) had 80%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/cap_conf_description.txt
new file mode 100644
index 00000000..a15b7366
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 30% of the radio resources, while Slice 2 (UE2) had 70%.
+UE1_slice: 30
+UE2_slice: 70
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/scenario_description.txt
deleted file mode 100644
index e9090a4b..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_2/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 10 M (ue1) 60M (ue2), and slice 1 (ue) had 30% of the radio resources, while slice 2 (ue 2) had 70%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/cap_conf_description.txt
new file mode 100644
index 00000000..41097150
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 40% of the radio resources, while Slice 2 (UE2) had 60%.
+UE1_slice: 40
+UE2_slice: 60
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/scenario_description.txt
deleted file mode 100644
index a3a3fa08..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_3/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 10 M (ue1) 60M (ue2), and slice 1 (ue) had 40% of the radio resources, while slice 2 (ue 2) had 60%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/cap_conf_description.txt
new file mode 100644
index 00000000..4ebdd863
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 50% of the radio resources, while Slice 2 (UE2) had 50%.
+UE1_slice: 50
+UE2_slice: 50
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/scenario_description.txt
deleted file mode 100644
index 2e7f4672..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_02/cap_conf_4/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 10 M (ue1) 60M (ue2), and slice 1 (ue) had 50% of the radio resources, while slice 2 (ue 2) had 50%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_02/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_02/scenario_description.txt
new file mode 100644
index 00000000..8f6e094e
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_02/scenario_description.txt
@@ -0,0 +1,3 @@
+description: This scenario used iperf bandwidths for each UE, with UE1 set to 10 Mbps and UE2 set to 60 Mbps.
+UE1_bandwidth: 10
+UE2_bandwidth: 60
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/cap_conf_description.txt
new file mode 100644
index 00000000..dbeb6a21
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 20% of the radio resources, while Slice 2 (UE2) had 80%.
+UE1_slice: 20
+UE2_slice: 80
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/scenario_description.txt
deleted file mode 100644
index 5ddf0cc5..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_1/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 20% of the radio resources, while slice 2 (ue 2) had 80%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/cap_conf_description.txt
new file mode 100644
index 00000000..a15b7366
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 30% of the radio resources, while Slice 2 (UE2) had 70%.
+UE1_slice: 30
+UE2_slice: 70
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/scenario_description.txt
deleted file mode 100644
index 70084946..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_2/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 30% of the radio resources, while slice 2 (ue 2) had 70%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/cap_conf_description.txt
new file mode 100644
index 00000000..41097150
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 40% of the radio resources, while Slice 2 (UE2) had 60%.
+UE1_slice: 40
+UE2_slice: 60
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/scenario_description.txt
deleted file mode 100644
index 3f220f60..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_3/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 40% of the radio resources, while slice 2 (ue 2) had 60%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/cap_conf_description.txt
new file mode 100644
index 00000000..4ebdd863
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 50% of the radio resources, while Slice 2 (UE2) had 50%.
+UE1_slice: 50
+UE2_slice: 50
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/scenario_description.txt
deleted file mode 100644
index 1213e246..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_4/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 50% of the radio resources, while slice 2 (ue 2) had 50%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/cap_conf_description.txt
new file mode 100644
index 00000000..c3140e3e
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 60% of the radio resources, while Slice 2 (UE2) had 40%.
+UE1_slice: 60
+UE2_slice: 40
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/scenario_description.txt
deleted file mode 100644
index 08d2fcda..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_5/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 60% of the radio resources, while slice 2 (ue 2) had 40%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/cap_conf_description.txt
new file mode 100644
index 00000000..d28d6f00
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 70% of the radio resources, while Slice 2 (UE2) had 30%.
+UE1_slice: 70
+UE2_slice: 30
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/scenario_description.txt
deleted file mode 100644
index 56e1aced..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_6/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 70% of the radio resources, while slice 2 (ue 2) had 30%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/cap_conf_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/cap_conf_description.txt
new file mode 100644
index 00000000..279c92bf
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/cap_conf_description.txt
@@ -0,0 +1,3 @@
+description: Slice 1 (UE1) had 80% of the radio resources, while Slice 2 (UE2) had 20%.
+UE1_slice: 80
+UE2_slice: 20
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/scenario_description.txt
deleted file mode 100644
index e4c5eb3f..00000000
--- a/openairinterface5g/carlos_mestrado/medicoes/scen_03/cap_conf_7/scenario_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This scenario used an iperf bandwidth of 60 M (ue1) 120M (ue2), and slice 1 (ue) had 80% of the radio resources, while slice 2 (ue 2) had 20%.
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/scen_03/scenario_description.txt b/openairinterface5g/carlos_mestrado/medicoes/scen_03/scenario_description.txt
new file mode 100644
index 00000000..16103013
--- /dev/null
+++ b/openairinterface5g/carlos_mestrado/medicoes/scen_03/scenario_description.txt
@@ -0,0 +1,3 @@
+description: This scenario used iperf bandwidths for each UE, with UE1 set to 60 Mbps and UE2 set to 120 Mbps.
+UE1_bandwidth: 60
+UE2_bandwidth: 120
\ No newline at end of file
diff --git a/openairinterface5g/carlos_mestrado/medicoes/script_plot_mestrado.py b/openairinterface5g/carlos_mestrado/medicoes/script_plot_mestrado.py
index 9454383c..4f8bfe76 100644
--- a/openairinterface5g/carlos_mestrado/medicoes/script_plot_mestrado.py
+++ b/openairinterface5g/carlos_mestrado/medicoes/script_plot_mestrado.py
@@ -11,7 +11,7 @@ scenarios = [name for name in os.listdir(main_folder) if os.path.isdir(os.path.j
scenarios = sorted(
scenarios,
key=lambda x: (
- x != "no_slicing", # Garante que "no_slicing" venha no final
+ x != "no_slicing",
int(x.split('_')[-1]) if x.startswith('scen_') and x.split('_')[-1].isdigit() else float('inf')
)
)
@@ -21,7 +21,7 @@ ue_dataframes = {}
for scenario in scenarios:
ue_dataframes[scenario] = {}
scenario_path = main_folder + scenario
- cap_confs = [name for name in os.listdir(scenario_path) if os.path.isdir(os.path.join(scenario_path, name))] ## Configuração da capacidade dos slices
+ cap_confs = [name for name in os.listdir(scenario_path) if os.path.isdir(os.path.join(scenario_path, name))]
for cap_conf in cap_confs:
ue_dataframes[scenario][cap_conf] = {}
cap_path = scenario_path + '/' + cap_conf
@@ -67,23 +67,24 @@ for scenario in scenarios:
else:
break
ue_dataframes[scenario][cap_conf][ue] = pd.DataFrame(data)
-pl_ue1 = []
-pl_ue2 = []
for scenario in scenarios:
+ pl_ue1 = []
+ pl_ue2 = []
scenario_path = main_folder + scenario
cap_confs = [name for name in os.listdir(scenario_path) if os.path.isdir(os.path.join(scenario_path, name))] ## Configuração da capacidade dos slices
cap_confs = sorted(cap_confs, key=lambda x: (x == 'no_slicing', x))
for cap_conf in cap_confs:
- plt.plot(ue_dataframes[scenario][cap_conf]['ue2']["Interval"], ue_dataframes[scenario][cap_conf]['ue2']["Bandwidth"], marker="o", label="UE2", color = "blue")
- plt.plot(ue_dataframes[scenario][cap_conf]['ue1']["Interval"], ue_dataframes[scenario][cap_conf]['ue1']["Bandwidth"], marker="o", label="UE2", color = "red")
+ plt.plot(ue_dataframes[scenario][cap_conf]['ue2']["Interval"], ue_dataframes[scenario][cap_conf]['ue2']["Bandwidth"], marker="o", label="UE2", color = "blue", linestyle="-")
+ plt.plot(ue_dataframes[scenario][cap_conf]['ue1']["Interval"], ue_dataframes[scenario][cap_conf]['ue1']["Bandwidth"], marker="o", label="UE1", color = "red", linestyle="--")
y_ticks = np.arange(0, max(ue_dataframes[scenario][cap_conf]['ue2']["Bandwidth"].max(),
- ue_dataframes[scenario][cap_conf]['ue1']["Bandwidth"].max()) + 10, 2) # Intervalo de 2 Mbps
+ ue_dataframes[scenario][cap_conf]['ue1']["Bandwidth"].max()) + 10, 10) # Intervalo de 2 Mbps
plt.yticks(y_ticks) # Define os valores do eixo Y com intervalos mais detalhados
plt.title(scenario)
- plt.xlabel("Time (s)")
- plt.ylabel("Bandwidth (Mbps)")
- plt.grid(True)
+ plt.xlabel("Tempo (s)")
+ plt.ylabel("Taxa oferecida (Mbps)")
+ plt.grid(which="both", linestyle="--", linewidth=0.5, alpha=0.7) # Grelha mais sutil
+ plt.tight_layout() # Garante que todos os elementos estejam visÃveis
plt.legend()
plt.tight_layout()
pl_ue1.append((ue_dataframes[scenario][cap_conf]['ue1']["PacketsLost"].sum()/ue_dataframes[scenario][cap_conf]['ue1']["TotalPackets"].sum())*100)
@@ -92,7 +93,6 @@ for scenario in scenarios:
# Configurar a posição das barras no eixo x
x = np.arange(len(cap_confs)) # Posições das scenarios
- print(x)
largura = 0.4 # Largura das barras
# Criar as barras
@@ -100,9 +100,9 @@ for scenario in scenarios:
plt.bar(x + largura / 2, pl_ue2, width=largura, label='UE2', color='blue') # Barras para UE2
# Adicionar rótulos e tÃtulo
- plt.xlabel('Scenarios')
- plt.ylabel('Packet Loss')
- plt.title('Packet Loss for each capacity configuration')
+ plt.xlabel('Diferentes configurações de capacidade')
+ plt.ylabel('Perda de pacote (%)')
+ plt.title('Perda de Pacotes para Diferentes Configurações de Capacidade')
plt.xticks(x, cap_confs) # Ajustar rótulos do eixo x
plt.legend() # Adicionar legenda
--
GitLab