From 77487c3736eeb60df8fba8d14491ff7bc5a7c120 Mon Sep 17 00:00:00 2001 From: Loic Guegan Date: Sat, 2 Jul 2022 21:07:01 +0200 Subject: [PATCH] Cleaning comments --- .../mobility_eth0_bandwidth_1s1r/simulator.py | 14 ++++++------- .../mobility_eth0_bandwidth_2s1r/simulator.py | 18 ++++++++--------- tests/mobility_eth0_latency_1s1r/simulator.py | 16 +++++++-------- tests/mobility_eth0_latency_2s1r/simulator.py | 20 +++++++++---------- .../simulator.py | 14 ++++++------- .../mobility_wlan0_latency_1s1r/simulator.py | 16 +++++++-------- 6 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/mobility_eth0_bandwidth_1s1r/simulator.py b/tests/mobility_eth0_bandwidth_1s1r/simulator.py index 396c79e..39ce86a 100755 --- a/tests/mobility_eth0_bandwidth_1s1r/simulator.py +++ b/tests/mobility_eth0_bandwidth_1s1r/simulator.py @@ -13,13 +13,13 @@ import numpy as np # - Initial data size (first row) = I # - Bandwidth = BW # - Latency = L -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communcation duration(s) | Communcation ends at(s) | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | 0 | 0 | 8 | 8 | 1 | 1 | -# | 0.5 | 0 | 16 | C/U*D = 4 | R/I * L + R/BW = 0.25 | 0.75 | -# | 0.75 | 0 | 16 | | | | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | 0 | 0 | 8 | 8 | 1 | 1 | +# | 0.5 | 0 | 16 | C/U*D = 4 | R/I * L + R/BW = 0.25 | 0.75 | +# | 0.75 | 0 | 16 | | | | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| ############################## B=np.full((2,2),8) diff --git a/tests/mobility_eth0_bandwidth_2s1r/simulator.py b/tests/mobility_eth0_bandwidth_2s1r/simulator.py index e1e6636..9840692 100755 --- a/tests/mobility_eth0_bandwidth_2s1r/simulator.py +++ b/tests/mobility_eth0_bandwidth_2s1r/simulator.py @@ -13,15 +13,15 @@ import numpy as np # - Initial data size (first row) = I # - Bandwidth = BW # - Latency = L -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| -# | This table is the same for both sender | | | | | | -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| -# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communcation ends at(s) | -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| -# | 0 | 0 | 8/2 | 8 | 2 | 2 | -# | 1 | 0 | 16/2 | C/U*D = 4 | 0.5 | 1.5 | -# | 1.5 | 0 | 16/2 | 0 | | | -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | This table is the same for both sender | | | | | | +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) | +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | 0 | 0 | 8/2 | 8 | 2 | 2 | +# | 1 | 0 | 16/2 | C/U*D = 4 | 0.5 | 1.5 | +# | 1.5 | 0 | 16/2 | 0 | | | +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| ############################## B=np.full((3,3),8) diff --git a/tests/mobility_eth0_latency_1s1r/simulator.py b/tests/mobility_eth0_latency_1s1r/simulator.py index 455a1cb..42ff85b 100755 --- a/tests/mobility_eth0_latency_1s1r/simulator.py +++ b/tests/mobility_eth0_latency_1s1r/simulator.py @@ -13,14 +13,14 @@ import numpy as np # - Initial data size (first row) = I # - Bandwidth = BW # - Latency = L -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communcation duration(s) | Communication ends at(s) | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | 0 | 0 | 8 | 8 | 1 | 1 | -# | 0.5 | 0.5 | 8 | C/U*D = 4 | R/I * L + R/BW = 0.75 | 1.25 | -# | 1 | 1 | 8 | C/U*D = 1.33 | R/I * L + R/BW = 0.33 | 1.33 | -# | 1.33 | 1 | 8 | | | | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | 0 | 0 | 8 | 8 | 1 | 1 | +# | 0.5 | 0.5 | 8 | C/U*D = 4 | R/I * L + R/BW = 0.75 | 1.25 | +# | 1 | 1 | 8 | C/U*D = 1.33 | R/I * L + R/BW = 0.33 | 1.33 | +# | 1.33 | 1 | 8 | | | | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| ############################## B=np.full((2,2),8) diff --git a/tests/mobility_eth0_latency_2s1r/simulator.py b/tests/mobility_eth0_latency_2s1r/simulator.py index cb4a8bb..17562de 100755 --- a/tests/mobility_eth0_latency_2s1r/simulator.py +++ b/tests/mobility_eth0_latency_2s1r/simulator.py @@ -13,16 +13,16 @@ import numpy as np # - Initial data size (first row) = I # - Bandwidth = BW # - Latency = L -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| -# | This table is the same for both sender | | | | | | -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| -# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communcation ends at(s) | -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| -# | 0 | 0 | 8/2 | 8 | 2 | 2 | -# | 1 | 0.5 | 8/2 | C/U*D=4 | R/BW + R/I*L = 1.25 | 2.25 | -# | 2 | 1 | 8/2 | C/U*D=0.8 | R/BW + R/I*L = 0.3 | 2.3 | -# | 2.3 | 1 | 8/2 | 0 | | | -# |----------------------------------------+------------+----------------+----------------------+---------------------------+-------------------------| +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | This table is the same for both sender | | | | | | +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) | +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | 0 | 0 | 8/2 | 8 | 2 | 2 | +# | 1 | 0.5 | 8/2 | C/U*D=4 | R/BW + R/I*L = 1.25 | 2.25 | +# | 2 | 1 | 8/2 | C/U*D=0.8 | R/BW + R/I*L = 0.3 | 2.3 | +# | 2.3 | 1 | 8/2 | 0 | | | +# |----------------------------------------+------------+----------------+----------------------+---------------------------+--------------------------| ############################## B=np.full((3,3),8) diff --git a/tests/mobility_wlan0_bandwidth_1s1r/simulator.py b/tests/mobility_wlan0_bandwidth_1s1r/simulator.py index 3826713..7fce9e9 100755 --- a/tests/mobility_wlan0_bandwidth_1s1r/simulator.py +++ b/tests/mobility_wlan0_bandwidth_1s1r/simulator.py @@ -13,13 +13,13 @@ import numpy as np # - Initial data size (first row) = I # - Bandwidth = BW # - Latency = L -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communcation duration(s) | Communcation ends at(s) | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | 0 | 0 | 8 | 8 | 1 | 1 | -# | 0.5 | 0 | 16 | C/U*D = 4 | R/I * L + R/BW = 0.25 | 0.75 | -# | 0.75 | 0 | 16 | | | | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | 0 | 0 | 8 | 8 | 1 | 1 | +# | 0.5 | 0 | 16 | C/U*D = 4 | R/I * L + R/BW = 0.25 | 0.75 | +# | 0.75 | 0 | 16 | | | | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| ############################## B=np.full((2,2),8) diff --git a/tests/mobility_wlan0_latency_1s1r/simulator.py b/tests/mobility_wlan0_latency_1s1r/simulator.py index c28bf15..92668f7 100755 --- a/tests/mobility_wlan0_latency_1s1r/simulator.py +++ b/tests/mobility_wlan0_latency_1s1r/simulator.py @@ -13,14 +13,14 @@ import numpy as np # - Initial data size (first row) = I # - Bandwidth = BW # - Latency = L -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communcation duration(s) | Communcation ends at(s) | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| -# | 0 | 0 | 8 | 8 | 1 | 1 | -# | 0.5 | 0.5 | 8 | C/U*D = 4 | R/I * L + R/BW = 0.75 | 1.25 | -# | 1 | 1 | 8 | C/U*D = 1.33 | R/I * L + R/BW = 0.33 | 1.33 | -# | 1.33 | 1 | 8 | | | | -# |-------------------+------------+----------------+----------------------+--------------------------+-------------------------| +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | Simulated time(s) | Latency(s) | Bandwidth(bps) | Remaining data (bit) | Communication duration(s) | Communication ends at(s) | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| +# | 0 | 0 | 8 | 8 | 1 | 1 | +# | 0.5 | 0.5 | 8 | C/U*D = 4 | R/I * L + R/BW = 0.75 | 1.25 | +# | 1 | 1 | 8 | C/U*D = 1.33 | R/I * L + R/BW = 0.33 | 1.33 | +# | 1.33 | 1 | 8 | | | | +# |-------------------+------------+----------------+----------------------+---------------------------+--------------------------| ############################## B=np.full((2,2),8)