diff options
| author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-01 12:19:40 +0200 |
|---|---|---|
| committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-07-01 12:19:40 +0200 |
| commit | 3ac16ddac029d00f71bfe722cb25d66c26961fc7 (patch) | |
| tree | 1c5d1bbd1d043bd20c296b62dbe69cca66b59523 /tests/alloc/AllocTest.cpp | |
| parent | 0bb98075f4046e55c48478520752b09f71b545e0 (diff) | |
alloc: Only use common UL slots when calculating the capacity
Currently al possible UL slots are included in the capacity
calculation which is the base of the slot selection. Nevertheless
UL-only slots will never be used, since only one uplink slot (which
must be a common slot) will be used.
This patch changes the code to only include common slots in the
capacity sum.
Note that this might not be optimal if algorithm B supported
multiple uplink slots.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'tests/alloc/AllocTest.cpp')
| -rw-r--r-- | tests/alloc/AllocTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp index ceccf886..5d62134f 100644 --- a/tests/alloc/AllocTest.cpp +++ b/tests/alloc/AllocTest.cpp @@ -495,9 +495,9 @@ int main(int argc, char **argv) test_alloc_b(); test_successive_allocation(alloc_algorithm_a, 1, 1, 32, "algorithm A"); test_successive_allocation(alloc_algorithm_b, 10, 10, 32, "algorithm B class 10"); - test_successive_allocation(alloc_algorithm_b, 12, 12, 29, "algorithm B class 12"); - test_successive_allocation(alloc_algorithm_b, 1, 12, 31, "algorithm B class 1-12"); - test_successive_allocation(alloc_algorithm_b, 1, 29, 24, "algorithm B class 1-29"); + test_successive_allocation(alloc_algorithm_b, 12, 12, 32, "algorithm B class 12"); + test_successive_allocation(alloc_algorithm_b, 1, 12, 32, "algorithm B class 1-12"); + test_successive_allocation(alloc_algorithm_b, 1, 29, 31, "algorithm B class 1-29"); return EXIT_SUCCESS; } |