Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'atp' of https://github.com/birarda/hifi into protocol

Browse source
This commit is contained in:
Atlante45 2015-08-03 11:08:22 -07:00
commit e182bbbc1b
2 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libraries/networking/src/udt/PacketTimeWindow.cpp
View file

@ -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)) {

2
tools/udt-test/src/UDTTest.cpp
View file

@ -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"
};