From 9146e6ddf10a597d73f006ab982e02fa288d4d3c Mon Sep 17 00:00:00 2001
From: Francisco Paisana <francisco.paisana@softwareradiosystems.com>
Date: Fri, 14 Aug 2020 10:50:45 +0100
Subject: [PATCH] change method name to resize intervals

---
 lib/include/srslte/adt/interval.h        | 4 ++--
 lib/test/adt/interval_test.cc            | 6 +++---
 srsenb/src/stack/mac/scheduler_grid.cc   | 4 ++--
 srsenb/src/stack/mac/scheduler_metric.cc | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/include/srslte/adt/interval.h b/lib/include/srslte/adt/interval.h
index 7928cc54f..ff892f334 100644
--- a/lib/include/srslte/adt/interval.h
+++ b/lib/include/srslte/adt/interval.h
@@ -56,14 +56,14 @@ public:
     stop_  = stop_point;
   }
 
-  void expand_by(T len)
+  void resize_by(T len)
   {
     // Detect length overflows
     assert(std::is_unsigned<T>::value or (len >= 0 or length() >= -len));
     stop_ += len;
   }
 
-  void expand_to(T len)
+  void resize_to(T len)
   {
     assert(std::is_unsigned<T>::value or len >= 0);
     stop_ = start_ + len;
diff --git a/lib/test/adt/interval_test.cc b/lib/test/adt/interval_test.cc
index 427ba6afc..8cf25b1b0 100644
--- a/lib/test/adt/interval_test.cc
+++ b/lib/test/adt/interval_test.cc
@@ -79,12 +79,12 @@ int test_interval_expand()
   srslte::interval<uint32_t> I{};
   srslte::interval<int>      I2{};
 
-  I.expand_by(5);
+  I.resize_by(5);
   TESTASSERT(I.length() == 5);
-  I.expand_by(-5);
+  I.resize_by(-5);
   TESTASSERT(I.length() == 0);
 
-  I2.expand_by(3);
+  I2.resize_by(3);
   TESTASSERT(I2.length() == 3);
   //  I2.expand_by(-4);
 
diff --git a/srsenb/src/stack/mac/scheduler_grid.cc b/srsenb/src/stack/mac/scheduler_grid.cc
index 0e3803ad7..f8ddb170b 100644
--- a/srsenb/src/stack/mac/scheduler_grid.cc
+++ b/srsenb/src/stack/mac/scheduler_grid.cc
@@ -538,7 +538,7 @@ bool sf_grid_t::find_ul_alloc(uint32_t L, prb_interval* alloc) const
       alloc->displace_to(n);
     }
     if (not ul_mask.test(n)) {
-      alloc->expand_by(1);
+      alloc->resize_by(1);
     } else if (alloc->length() > 0) {
       // avoid edges
       if (n < 3) {
@@ -554,7 +554,7 @@ bool sf_grid_t::find_ul_alloc(uint32_t L, prb_interval* alloc) const
 
   // Make sure L is allowed by SC-FDMA modulation
   while (!srslte_dft_precoding_valid_prb(alloc->length())) {
-    alloc->expand_by(-1);
+    alloc->resize_by(-1);
   }
   return alloc->length() == L;
 }
diff --git a/srsenb/src/stack/mac/scheduler_metric.cc b/srsenb/src/stack/mac/scheduler_metric.cc
index a605586fd..1d7c6b0f4 100644
--- a/srsenb/src/stack/mac/scheduler_metric.cc
+++ b/srsenb/src/stack/mac/scheduler_metric.cc
@@ -212,7 +212,7 @@ bool ul_metric_rr::find_allocation(uint32_t L, prb_interval* alloc)
       alloc->displace_to(n);
     }
     if (not used_rb->test(n)) {
-      alloc->expand_by(1);
+      alloc->resize_by(1);
     } else if (alloc->length() > 0) {
       // avoid edges
       if (n < 3) {
@@ -228,7 +228,7 @@ bool ul_metric_rr::find_allocation(uint32_t L, prb_interval* alloc)
 
   // Make sure L is allowed by SC-FDMA modulation
   while (!srslte_dft_precoding_valid_prb(alloc->length())) {
-    alloc->expand_by(-1);
+    alloc->resize_by(-1);
   }
   return alloc->length() == L;
 }