Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize runtime configurable version #23

Merged
merged 2 commits into from
Jul 25, 2024
Merged

Optimize runtime configurable version #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6271ede
Add copy_coeff_from
mike919192 Jul 25, 2024
14b5541
Optimize runtime configurable version
mike919192 Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 50 additions & 15 deletions include/sdsp/casc2orderIIR.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@ class casc2orderIIR {
static_assert(M % 2 == 0, "M must be even!");
}

void copy_coeff_from(casc2orderIIR<M> otherFilter)
{
gain = otherFilter.gain;
bCoeff = otherFilter.bCoeff;
aCoeff = otherFilter.aCoeff;
fType = otherFilter.fType;
}

template <typename Iter>
void Process(Iter begin, Iter end)
{
Expand Down Expand Up @@ -54,7 +62,7 @@ class casc2orderIIR {
uint j;

for (j = 0; j < M; j++) {
y.at(j + 1).at(p) = y.at(j).at(p) * b.at(j).at(0);
y.at(j + 1).at(p) = y.at(j).at(p);

y.at(j + 1).at(p) += y.at(j).at(d1) * b.at(j).at(j1) - y.at(j + 1).at(d1) * a.at(j).at(j1);
y.at(j + 1).at(p) += y.at(j).at(d2) * b.at(j).at(j2) - y.at(j + 1).at(d2) * a.at(j).at(j2);
Expand Down Expand Up @@ -111,12 +119,14 @@ class casc2orderIIR {
double alpha1{ (0.5 - beta1) * t / 2.0 };
double alpha2{ (0.5 - beta2) * t / 2.0 };

bCoeff.at(2 * k).at(0) = 2 * alpha1;
bCoeff.at(2 * k + 1).at(0) = 2 * alpha2;
gain *= 4 * alpha1 * alpha2;

bCoeff.at(2 * k).at(0) = 1.0;
bCoeff.at(2 * k + 1).at(0) = 1.0;
bCoeff.at(2 * k).at(1) = 0;
bCoeff.at(2 * k + 1).at(1) = 0;
bCoeff.at(2 * k).at(2) = -bCoeff.at(2 * k).at(0);
bCoeff.at(2 * k + 1).at(2) = -bCoeff.at(2 * k + 1).at(0);
bCoeff.at(2 * k).at(2) = -1.0;
bCoeff.at(2 * k + 1).at(2) = -1.0;

aCoeff.at(2 * k).at(0) = 1;
aCoeff.at(2 * k + 1).at(0) = 1;
Expand All @@ -141,11 +151,13 @@ class casc2orderIIR {

double beta1{ (1 - t) / dnm / 2 };
double gamma1{ (0.5 + beta1) * std::cos(e0) };
double alpha1{ (0.5 + beta1 + gamma1) / 4 }; //-
double alpha1{ (0.5 + beta1 + gamma1) / 4 };

gain *= 2 * alpha1;

bCoeff.at(k).at(0) = 2 * alpha1;
bCoeff.at(k).at(1) = -2 * bCoeff.at(k).at(0); //-
bCoeff.at(k).at(2) = bCoeff.at(k).at(0);
bCoeff.at(k).at(0) = 1.0;
bCoeff.at(k).at(1) = -2.0;
bCoeff.at(k).at(2) = 1.0;

aCoeff.at(k).at(0) = 1;
aCoeff.at(k).at(1) = -2 * gamma1;
Expand All @@ -169,9 +181,11 @@ class casc2orderIIR {
double gamma1{ (0.5 + beta1) * std::cos(e0) };
double alpha1{ (0.5 + beta1 - gamma1) / 4 };

bCoeff.at(k).at(0) = 2 * alpha1;
bCoeff.at(k).at(1) = 2 * bCoeff.at(k).at(0);
bCoeff.at(k).at(2) = bCoeff.at(k).at(0);
gain *= 2 * alpha1;

bCoeff.at(k).at(0) = 1.0;
bCoeff.at(k).at(1) = 2.0;
bCoeff.at(k).at(2) = 1.0;

aCoeff.at(k).at(0) = 1;
aCoeff.at(k).at(1) = -2 * gamma1;
Expand All @@ -182,14 +196,17 @@ class casc2orderIIR {
// preload the filter memory for steady state input equal to value parameter
void PreloadFilter(double value)
{
double preload_value = value * gain;
std::array<std::array<double, 3>, M + 1> memVals{ 0 };
for (int i = 0; i < 3; i++) {
memVals.at(0).at(i) = value;
memVals.at(0).at(i) = preload_value;
}
if (fType == FilterType::LowPass) {
for (uint j = 1; j < M + 1; j++) {
preload_value /= 1 + aCoeff.at(j - 1).at(1) + aCoeff.at(j - 1).at(2);
preload_value *= bCoeff.at(j - 1).at(0) + bCoeff.at(j - 1).at(1) + bCoeff.at(j - 1).at(2);
for (uint i = 0; i < 3; i++) {
memVals.at(j).at(i) = value;
memVals.at(j).at(i) = preload_value;
}
}
}
Expand Down Expand Up @@ -254,6 +271,12 @@ class casc_2o_IIR_lp : casc_2o_IIR<M> {
static_assert(M % 2 == 0, "M must be even!");
}

void copy_coeff_from(casc_2o_IIR_lp<M> otherFilter)
{
this->gain = otherFilter.gain;
this->aCoeff = otherFilter.aCoeff;
}

template <typename Iter>
void process(Iter begin, Iter end)
{
Expand Down Expand Up @@ -306,6 +329,12 @@ class casc_2o_IIR_hp : casc_2o_IIR<M> {
static_assert(M % 2 == 0, "M must be even!");
}

void copy_coeff_from(casc_2o_IIR_hp<M> otherFilter)
{
this->gain = otherFilter.gain;
this->aCoeff = otherFilter.aCoeff;
}

template <typename Iter>
void process(Iter begin, Iter end)
{
Expand Down Expand Up @@ -358,6 +387,12 @@ class casc_2o_IIR_bp : casc_2o_IIR<M> {
static_assert(M % 2 == 0, "M must be even!");
}

void copy_coeff_from(casc_2o_IIR_bp<M> otherFilter)
{
this->gain = otherFilter.gain;
this->aCoeff = otherFilter.aCoeff;
}

template <typename Iter>
void process(Iter begin, Iter end)
{
Expand Down Expand Up @@ -431,4 +466,4 @@ class casc_2o_IIR_bp : casc_2o_IIR<M> {
}
}
};
}
}
Loading