From ffb5fcee7b9c273a9098a016b6e9f6d2ad83db0d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Aug 2015 10:25:40 -0700
Subject: [PATCH 1/2] use nth element for median in PacketTimeWindow

---
 .../networking/src/udt/PacketTimeWindow.cpp   | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/libraries/networking/src/udt/PacketTimeWindow.cpp b/libraries/networking/src/udt/PacketTimeWindow.cpp
index e28b276ed9..269d158b7d 100644
--- a/libraries/networking/src/udt/PacketTimeWindow.cpp
+++ b/libraries/networking/src/udt/PacketTimeWindow.cpp
@@ -11,6 +11,7 @@
 
 #include "PacketTimeWindow.h"
 
+#include <numeric>
 #include <cmath>
 
 #include <NumericalConstants.h>
@@ -30,22 +31,32 @@ PacketTimeWindow::PacketTimeWindow(int numPacketIntervals, int numProbeIntervals
     
 }
 
-int32_t meanOfMedianFilteredValues(std::vector<int> intervals, int numValues, int valuesRequired = 0) {
-    // sort the intervals from smallest to largest
-    std::sort(intervals.begin(), intervals.end());
+template <typename Iterator>
+int median(Iterator begin, Iterator end) {
+    // use std::nth_element to grab the middle - for an even number of elements this is the upper middle
+    Iterator middle = begin + (end - begin) / 2;
+    std::nth_element(begin, middle, end);
     
-    int median = 0;
-    if (numValues % 2 == 0) {
-        median = intervals[numValues / 2];
+    if ((end - begin) % 2 != 0) {
+        // odd number of elements, just return the middle
+        return *middle;
     } else {
-        median = (intervals[(numValues / 2) - 1] + intervals[numValues / 2]) / 2;
+        // even number of elements, return the mean of the upper middle and the lower middle
+        Iterator lowerMiddle = std::max_element(begin, middle);
+        return (*middle + *lowerMiddle) / 2;
     }
+}
+
+int32_t meanOfMedianFilteredValues(std::vector<int> intervals, int numValues, int valuesRequired = 0) {
+    // grab the median value of the intervals vector
+    int intervalsMedian = median(intervals.begin(), intervals.end());
     
-    int count = 0;
-    int sum = 0;
     static const int MEDIAN_FILTERING_BOUND_MULTIPLIER = 8;
-    int upperBound = median * MEDIAN_FILTERING_BOUND_MULTIPLIER;
-    int lowerBound = median / MEDIAN_FILTERING_BOUND_MULTIPLIER;
+    int upperBound = intervalsMedian * MEDIAN_FILTERING_BOUND_MULTIPLIER;
+    int lowerBound = intervalsMedian / MEDIAN_FILTERING_BOUND_MULTIPLIER;
+    
+    int sum = 0;
+    int count = 0;
     
     for (auto& interval : intervals) {
         if ((interval < upperBound) && (interval > lowerBound)) {

From 4230d021848a40f1e1218c709e07f12db9357bc5 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 3 Aug 2015 11:06:48 -0700
Subject: [PATCH 2/2] rename col for light ACKs

---
 tools/udt-test/src/UDTTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/udt-test/src/UDTTest.cpp b/tools/udt-test/src/UDTTest.cpp
index eaa7530989..babf4b8c25 100644
--- a/tools/udt-test/src/UDTTest.cpp
+++ b/tools/udt-test/src/UDTTest.cpp
@@ -43,7 +43,7 @@ const QCommandLineOption UNRELIABLE_PACKETS {
 
 const QStringList STATS_TABLE_HEADERS {
     "Send Rate (P/s)", "RTT(ms)", "CW (P)", "Send Period (us)",
-    "Received ACK", "Received L-ACK", "Received NAK", "Received TNAK",
+    "Received ACK", "Received LACK", "Received NAK", "Received TNAK",
     "Sent ACK2", "Re-sent Packets"
 };