use simple Delay for the window

This commit is contained in:
Ahmet Inan 2020-10-13 16:23:54 +02:00
commit 1ae40ccf3b

View file

@ -6,6 +6,7 @@ Copyright 2020 Ahmet Inan <inan@aicodix.de>
#pragma once
#include "delay.hh"
#include "deque.hh"
namespace DSP {
@ -44,22 +45,60 @@ public:
template <typename TYPE, int NUM>
class MovMin
{
MovExt<TYPE, std::equal_to<TYPE>, std::less<TYPE>, NUM> movmin;
Delay<TYPE, NUM> window;
Deque<TYPE, NUM> dispenser, refill;
public:
MovMin() : window(std::numeric_limits<TYPE>::max())
{
dispenser.push_front(std::numeric_limits<TYPE>::max());
}
TYPE operator () (TYPE input)
{
return movmin(input);
if (window(input) == dispenser.front())
dispenser.pop_front();
while (!refill.empty() && input < refill.front())
refill.pop_front();
refill.push_front(input);
if (dispenser.empty()) {
while (!refill.empty()) {
dispenser.push_front(refill.front());
refill.pop_front();
}
return dispenser.front();
}
return dispenser.front() < refill.back() ? dispenser.front() : refill.back();
}
};
template <typename TYPE, int NUM>
class MovMax
{
MovExt<TYPE, std::equal_to<TYPE>, std::greater<TYPE>, NUM> movmax;
Delay<TYPE, NUM> window;
Deque<TYPE, NUM> dispenser, refill;
public:
MovMax() : window(std::numeric_limits<TYPE>::min())
{
dispenser.push_front(std::numeric_limits<TYPE>::min());
}
TYPE operator () (TYPE input)
{
return movmax(input);
if (window(input) == dispenser.front())
dispenser.pop_front();
while (!refill.empty() && input > refill.front())
refill.pop_front();
refill.push_front(input);
if (dispenser.empty()) {
while (!refill.empty()) {
dispenser.push_front(refill.front());
refill.pop_front();
}
return dispenser.front();
}
return dispenser.front() > refill.back() ? dispenser.front() : refill.back();
}
};