commit 5e3773dd5a92f40fbf02541fe31b95f786313768
author Davide Pesavento <davidepesa@gmail.com> Thu Aug 22 15:35:08 2019 -0400
committer Davide Pesavento <davidepesa@gmail.com> Thu Aug 22 15:35:08 2019 -0400
tree a15bf897b5bc5948c0ee056ee29f57b2b24e0897
parent 50cf6db4739501280cb2f7018a57ac4866046057

catchunks: switch to RttEstimatorWithStats

Refs: #4887
Change-Id: I8d49eff6ff4a7dc9ff49ffacc0744e50695128d2

tests/chunks/pipeline-interests-aimd.t.cpp

diff --git a/tests/chunks/pipeline-interests-aimd.t.cpp b/tests/chunks/pipeline-interests-aimd.t.cpp
index 0f18f70..d0d0bb0 100644
--- a/tests/chunks/pipeline-interests-aimd.t.cpp
+++ b/tests/chunks/pipeline-interests-aimd.t.cpp
@@ -71,23 +71,23 @@
     return pipelineOptions;
   }
 
-  static RttEstimator::Options
+  static shared_ptr<RttEstimatorWithStats::Options>
   makeRttEstimatorOptions()
   {
-    RttEstimator::Options rttOptions;
-    rttOptions.alpha = 0.125;
-    rttOptions.beta = 0.25;
-    rttOptions.k = 4;
-    rttOptions.initialRto = 1_s;
-    rttOptions.minRto = 200_ms;
-    rttOptions.maxRto = 4_s;
-    rttOptions.rtoBackoffMultiplier = 2;
+    auto rttOptions = make_shared<RttEstimatorWithStats::Options>();
+    rttOptions->alpha = 0.125;
+    rttOptions->beta = 0.25;
+    rttOptions->k = 4;
+    rttOptions->initialRto = 1_s;
+    rttOptions->minRto = 200_ms;
+    rttOptions->maxRto = 4_s;
+    rttOptions->rtoBackoffMultiplier = 2;
     return rttOptions;
   }
 
 protected:
   PipelineInterestsAdaptive::Options opt;
-  RttEstimator rttEstimator;
+  RttEstimatorWithStats rttEstimator;
   PipelineInterestsAdaptive* pipeline;
   static constexpr double MARGIN = 0.001;
 };

tests/chunks/pipeline-interests-cubic.t.cpp

diff --git a/tests/chunks/pipeline-interests-cubic.t.cpp b/tests/chunks/pipeline-interests-cubic.t.cpp
index 03e3f9d..0d2edf0 100644
--- a/tests/chunks/pipeline-interests-cubic.t.cpp
+++ b/tests/chunks/pipeline-interests-cubic.t.cpp
@@ -73,23 +73,23 @@
     return pipelineOptions;
   }
 
-  static RttEstimator::Options
+  static shared_ptr<RttEstimatorWithStats::Options>
   makeRttEstimatorOptions()
   {
-    RttEstimator::Options rttOptions;
-    rttOptions.alpha = 0.125;
-    rttOptions.beta = 0.25;
-    rttOptions.k = 8;
-    rttOptions.initialRto = 1_s;
-    rttOptions.minRto = 200_ms;
-    rttOptions.maxRto = 4_s;
-    rttOptions.rtoBackoffMultiplier = 2;
+    auto rttOptions = make_shared<RttEstimatorWithStats::Options>();
+    rttOptions->alpha = 0.125;
+    rttOptions->beta = 0.25;
+    rttOptions->k = 8;
+    rttOptions->initialRto = 1_s;
+    rttOptions->minRto = 200_ms;
+    rttOptions->maxRto = 4_s;
+    rttOptions->rtoBackoffMultiplier = 2;
     return rttOptions;
   }
 
 protected:
   PipelineInterestsCubic::Options opt;
-  RttEstimator rttEstimator;
+  RttEstimatorWithStats rttEstimator;
   PipelineInterestsCubic* pipeline;
   static constexpr double MARGIN = 0.001;
 };