Improve and simplify code with modern C++ features
Change-Id: I83bf5513c2a1f90ba5a59e93c473306864b27d94
diff --git a/core/rtt-estimator.hpp b/core/rtt-estimator.hpp
index 2b93880..e8a5eb9 100644
--- a/core/rtt-estimator.hpp
+++ b/core/rtt-estimator.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017, Regents of the University of California,
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -33,7 +33,7 @@
/**
* \brief implements the Mean-Deviation RTT estimator
*
- * reference: ns3::RttMeanDeviation
+ * \sa ns3::RttMeanDeviation
*
* This RttEstimator algorithm is designed for TCP, which is a continuous stream.
* NDN Interest-Data traffic is not always a continuous stream,
@@ -43,18 +43,18 @@
class RttEstimator
{
public:
- typedef time::microseconds Duration;
-
- static Duration
- getInitialRtt(void)
- {
- return time::seconds(1);
- }
+ using Duration = time::microseconds;
RttEstimator(uint16_t maxMultiplier = 16,
- Duration minRto = time::milliseconds(1),
+ Duration minRto = 1_ms,
double gain = 0.1);
+ static Duration
+ getInitialRtt()
+ {
+ return 1_s;
+ }
+
void
addMeasurement(Duration measure);