VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-10 18:43:28 -05:00
Code Issues Projects Releases Wiki Activity

WDSP: use double internally for SNBA

Browse Source
This commit is contained in:
f4exb 2024-07-03 01:03:49 +02:00
parent a229c583ee
commit 7be39b1b55
4 changed files with 303 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
wdsp/lmath.cpp
View File

@ -52,6 +52,28 @@ void LMath::dR (int n, float* r, float* y, float* z)
} }
} }
void LMathd::dR (int n, double* r, double* y, double* z)
{
int i, j, k;
double alpha, beta, gamma;
memset (z, 0, (n - 1) * sizeof (double)); // work space
y[0] = -r[1];
alpha = -r[1];
beta = 1.0;
for (k = 0; k < n - 1; k++)
{
beta *= 1.0 - alpha * alpha;
gamma = 0.0;
for (i = k + 1, j = 0; i > 0; i--, j++)
gamma += r[i] * y[j];
alpha = - (r[k + 2] + gamma) / beta;
for (i = 0, j = k; i <= k; i++, j--)
z[i] = y[i] + alpha * y[j];
memcpy (y, z, (k + 1) * sizeof (double));
y[k + 1] = alpha;
}
}
void LMath::trI ( void LMath::trI (
int n, int n,
float* r, float* r,
@ -94,6 +116,48 @@ void LMath::trI (
} }
} }
void LMathd::trI (
int n,
double* r,
double* B,
double* y,
double* v,
double* dR_z
)
{
int i, j, ni, nj;
double gamma, t, scale, b;
memset (y, 0, (n - 1) * sizeof (double)); // work space
memset (v, 0, (n - 1) * sizeof (double)); // work space
scale = 1.0 / r[0];
for (i = 0; i < n; i++)
r[i] *= scale;
dR(n - 1, r, y, dR_z);
t = 0.0;
for (i = 0; i < n - 1; i++)
t += r[i + 1] * y[i];
gamma = 1.0 / (1.0 + t);
for (i = 0, j = n - 2; i < n - 1; i++, j--)
v[i] = gamma * y[j];
B[0] = gamma;
for (i = 1, j = n - 2; i < n; i++, j--)
B[i] = v[j];
for (i = 1; i <= (n - 1) / 2; i++)
for (j = i; j < n - i; j++)
B[i * n + j] = B[(i - 1) * n + (j - 1)] + (v[n - j - 1] * v[n - i - 1] - v[i - 1] * v[j - 1]) / gamma;
for (i = 0; i <= (n - 1)/2; i++)
for (j = i; j < n - i; j++)
{
b = B[i * n + j] *= scale;
B[j * n + i] = b;
ni = n - i - 1;
nj = n - j - 1;
B[ni * n + nj] = b;
B[nj * n + ni] = b;
}
}
void LMath::asolve(int xsize, int asize, float* x, float* a, float* r, float* z) void LMath::asolve(int xsize, int asize, float* x, float* a, float* r, float* z)
{ {
int i, j, k; int i, j, k;
@ -128,6 +192,41 @@ void LMath::asolve(int xsize, int asize, float* x, float* a, float* r, float* z)
} }
} }
void LMathd::asolve(int xsize, int asize, double* x, double* a, double* r, double* z)
{
int i, j, k;
double beta, alpha, t;
memset(r, 0, (asize + 1) * sizeof(double)); // work space
memset(z, 0, (asize + 1) * sizeof(double)); // work space
for (i = 0; i <= asize; i++)
{
for (j = 0; j < xsize; j++)
r[i] += x[j] * x[j - i];
}
z[0] = 1.0;
beta = r[0];
for (k = 0; k < asize; k++)
{
alpha = 0.0;
for (j = 0; j <= k; j++)
alpha -= z[j] * r[k + 1 - j];
alpha /= beta;
for (i = 0; i <= (k + 1) / 2; i++)
{
t = z[k + 1 - i] + alpha * z[i];
z[i] = z[i] + alpha * z[k + 1 - i];
z[k + 1 - i] = t;
}
beta *= 1.0 - alpha * alpha;
}
for (i = 0; i < asize; i++)
{
a[i] = - z[i + 1];
if (a[i] != a[i]) a[i] = 0.0;
}
}
void LMath::median (int n, float* a, float* med) void LMath::median (int n, float* a, float* med)
{ {
int S0, S1, i, j, m, k; int S0, S1, i, j, m, k;
@ -186,4 +285,62 @@ void LMath::median (int n, float* a, float* med)
*med = a[k]; *med = a[k];
} }
void LMathd::median (int n, double* a, double* med)
{
int S0, S1, i, j, m, k;
double x, t;
S0 = 0;
S1 = n - 1;
k = n / 2;
while (S1 > S0 + 1)
{
m = (S0 + S1) / 2;
t = a[m];
a[m] = a[S0 + 1];
a[S0 + 1] = t;
if (a[S0] > a[S1])
{
t = a[S0];
a[S0] = a[S1];
a[S1] = t;
}
if (a[S0 + 1] > a[S1])
{
t = a[S0 + 1];
a[S0 + 1] = a[S1];
a[S1] = t;
}
if (a[S0] > a[S0 + 1])
{
t = a[S0];
a[S0] = a[S0 + 1];
a[S0 + 1] = t;
}
i = S0 + 1;
j = S1;
x = a[S0 + 1];
do i++; while (a[i] < x);
do j--; while (a[j] > x);
while (j >= i)
{
t = a[i];
a[i] = a[j];
a[j] = t;
do i++; while (a[i] < x);
do j--; while (a[j] > x);
}
a[S0 + 1] = a[j];
a[j] = x;
if (j >= k) S1 = j - 1;
if (j <= k) S0 = i;
}
if (S1 == S0 + 1 && a[S1] < a[S0])
{
t = a[S0];
a[S0] = a[S1];
a[S1] = t;
}
*med = a[k];
}
} // namespace WDSP } // namespace WDSP

15
wdsp/lmath.hpp
View File

@ -47,6 +47,21 @@ public:
static void median(int n, float* a, float* med); static void median(int n, float* a, float* med);
}; };
class WDSP_API LMathd {
public:
static void dR (int n, double* r, double* y, double* z);
static void trI (
int n,
double* r,
double* B,
double* y,
double* v,
double* dR_z
);
static void asolve(int xsize, int asize, double* x, double* a, double* r, double* z);
static void median(int n, double* a, double* med);
};
} // namespace WDSP } // namespace WDSP
#endif #endif

163
wdsp/snba.cpp
View File

@ -56,9 +56,28 @@ void SNBA::calc_snba (SNBA *d)
else else
d->resamprun = 0; d->resamprun = 0;
d->inresamp = RESAMPLE::create_resample (d->resamprun, d->bsize, d->in, d->inbuff, d->inrate, d->internalrate, 0.0, 0, 2.0); d->inresamp = RESAMPLE::create_resample (
d->resamprun,
d->bsize, d->in,
d->inbuff,
d->inrate,
d->internalrate,
0.0,
0,
2.0
);
RESAMPLE::setFCLow_resample (d->inresamp, 250.0); RESAMPLE::setFCLow_resample (d->inresamp, 250.0);
d->outresamp = RESAMPLE::create_resample (d->resamprun, d->isize, d->outbuff, d->out, d->internalrate, d->inrate, 0.0, 0, 2.0); d->outresamp = RESAMPLE::create_resample (
d->resamprun,
d->isize,
d->outbuff,
d->out,
d->internalrate,
d->inrate,
0.0,
0,
2.0
);
RESAMPLE::setFCLow_resample (d->outresamp, 200.0); RESAMPLE::setFCLow_resample (d->outresamp, 200.0);
d->incr = d->xsize / d->ovrlp; d->incr = d->xsize / d->ovrlp;
@ -69,7 +88,7 @@ void SNBA::calc_snba (SNBA *d)
d->iainidx = 0; d->iainidx = 0;
d->iaoutidx = 0; d->iaoutidx = 0;
d->inaccum = new float[d->iasize * 2]; // (double *) malloc0 (d->iasize * sizeof (double)); d->inaccum = new double[d->iasize * 2]; // (double *) malloc0 (d->iasize * sizeof (double));
d->nsamps = 0; d->nsamps = 0;
if (d->incr > d->isize) if (d->incr > d->isize)
@ -86,7 +105,7 @@ void SNBA::calc_snba (SNBA *d)
} }
d->init_oaoutidx = d->oaoutidx; d->init_oaoutidx = d->oaoutidx;
d->outaccum = new float[d->oasize * 2]; // (double *) malloc0 (d->oasize * sizeof (double)); d->outaccum = new double[d->oasize * 2]; // (double *) malloc0 (d->oasize * sizeof (double));
} }
SNBA* SNBA::create_snba ( SNBA* SNBA::create_snba (
@ -132,30 +151,30 @@ SNBA* SNBA::create_snba (
calc_snba (d); calc_snba (d);
d->xbase = new float[2 * d->xsize]; // (double *) malloc0 (2 * d->xsize * sizeof (double)); d->xbase = new double[2 * d->xsize]; // (double *) malloc0 (2 * d->xsize * sizeof (double));
d->xaux = d->xbase + d->xsize; d->xaux = d->xbase + d->xsize;
d->exec.a = new float[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double)); d->exec.a = new double[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double));
d->exec.v = new float[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double)); d->exec.v = new double[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double));
d->exec.detout = new int[d->xsize]; //(int *) malloc0 (d->xsize * sizeof (int)); d->exec.detout = new int[d->xsize]; //(int *) malloc0 (d->xsize * sizeof (int));
d->exec.savex = new float[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double)); d->exec.savex = new double[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double));
d->exec.xHout = new float[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double)); d->exec.xHout = new double[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double));
d->exec.unfixed = new int[d->xsize]; //(int *) malloc0 (d->xsize * sizeof (int)); d->exec.unfixed = new int[d->xsize]; //(int *) malloc0 (d->xsize * sizeof (int));
d->sdet.vp = new float[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double)); d->sdet.vp = new double[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double));
d->sdet.vpwr = new float[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double)); d->sdet.vpwr = new double[d->xsize]; //(double *) malloc0 (d->xsize * sizeof (double));
d->wrk.xHat_a1rows_max = d->xsize + d->exec.asize; d->wrk.xHat_a1rows_max = d->xsize + d->exec.asize;
d->wrk.xHat_a2cols_max = d->xsize + 2 * d->exec.asize; d->wrk.xHat_a2cols_max = d->xsize + 2 * d->exec.asize;
d->wrk.xHat_r = new float[d->xsize]; // (double *) malloc0 (d->xsize * sizeof(double)); d->wrk.xHat_r = new double[d->xsize]; // (double *) malloc0 (d->xsize * sizeof(double));
d->wrk.xHat_ATAI = new float[d->xsize * d->xsize]; // (double *) malloc0 (d->xsize * d->xsize * sizeof(double)); d->wrk.xHat_ATAI = new double[d->xsize * d->xsize]; // (double *) malloc0 (d->xsize * d->xsize * sizeof(double));
d->wrk.xHat_A1 = new float[d->wrk.xHat_a1rows_max * d->xsize]; // (double *) malloc0 (d->wrk.xHat_a1rows_max * d->xsize * sizeof(double)); d->wrk.xHat_A1 = new double[d->wrk.xHat_a1rows_max * d->xsize]; // (double *) malloc0 (d->wrk.xHat_a1rows_max * d->xsize * sizeof(double));
d->wrk.xHat_A2 = new float[d->wrk.xHat_a1rows_max * d->wrk.xHat_a2cols_max]; // (double *) malloc0 (d->wrk.xHat_a1rows_max * d->wrk.xHat_a2cols_max * sizeof(double)); d->wrk.xHat_A2 = new double[d->wrk.xHat_a1rows_max * d->wrk.xHat_a2cols_max]; // (double *) malloc0 (d->wrk.xHat_a1rows_max * d->wrk.xHat_a2cols_max * sizeof(double));
d->wrk.xHat_P1 = new float[d->xsize * d->wrk.xHat_a2cols_max]; // (double *) malloc0 (d->xsize * d->wrk.xHat_a2cols_max * sizeof(double)); d->wrk.xHat_P1 = new double[d->xsize * d->wrk.xHat_a2cols_max]; // (double *) malloc0 (d->xsize * d->wrk.xHat_a2cols_max * sizeof(double));
d->wrk.xHat_P2 = new float[d->xsize]; // (double *) malloc0 (d->xsize * sizeof(double)); d->wrk.xHat_P2 = new double[d->xsize]; // (double *) malloc0 (d->xsize * sizeof(double));
d->wrk.trI_y = new float[d->xsize - 1]; // (double *) malloc0 ((d->xsize - 1) * sizeof(double)); d->wrk.trI_y = new double[d->xsize - 1]; // (double *) malloc0 ((d->xsize - 1) * sizeof(double));
d->wrk.trI_v = new float[d->xsize - 1]; // (double *) malloc0 ((d->xsize - 1) * sizeof(double)); d->wrk.trI_v = new double[d->xsize - 1]; // (double *) malloc0 ((d->xsize - 1) * sizeof(double));
d->wrk.dR_z = new float[d->xsize - 2]; // (double *) malloc0 ((d->xsize - 2) * sizeof(double)); d->wrk.dR_z = new double[d->xsize - 2]; // (double *) malloc0 ((d->xsize - 2) * sizeof(double));
d->wrk.asolve_r = new float[d->exec.asize + 1]; // (double *) malloc0 ((d->exec.asize + 1) * sizeof(double)); d->wrk.asolve_r = new double[d->exec.asize + 1]; // (double *) malloc0 ((d->exec.asize + 1) * sizeof(double));
d->wrk.asolve_z = new float[d->exec.asize + 1]; // (double *) malloc0 ((d->exec.asize + 1) * sizeof(double)); d->wrk.asolve_z = new double[d->exec.asize + 1]; // (double *) malloc0 ((d->exec.asize + 1) * sizeof(double));
return d; return d;
} }
@ -208,17 +227,17 @@ void SNBA::flush_snba (SNBA *d)
d->oainidx = 0; d->oainidx = 0;
d->oaoutidx = d->init_oaoutidx; d->oaoutidx = d->init_oaoutidx;
memset (d->inaccum, 0, d->iasize * sizeof (float)); memset (d->inaccum, 0, d->iasize * sizeof (double));
memset (d->outaccum, 0, d->oasize * sizeof (float)); memset (d->outaccum, 0, d->oasize * sizeof (double));
memset (d->xaux, 0, d->xsize * sizeof (float)); memset (d->xaux, 0, d->xsize * sizeof (double));
memset (d->exec.a, 0, d->xsize * sizeof (float)); memset (d->exec.a, 0, d->xsize * sizeof (double));
memset (d->exec.v, 0, d->xsize * sizeof (float)); memset (d->exec.v, 0, d->xsize * sizeof (double));
memset (d->exec.detout, 0, d->xsize * sizeof (int)); memset (d->exec.detout, 0, d->xsize * sizeof (int));
memset (d->exec.savex, 0, d->xsize * sizeof (float)); memset (d->exec.savex, 0, d->xsize * sizeof (double));
memset (d->exec.xHout, 0, d->xsize * sizeof (float)); memset (d->exec.xHout, 0, d->xsize * sizeof (double));
memset (d->exec.unfixed, 0, d->xsize * sizeof (int)); memset (d->exec.unfixed, 0, d->xsize * sizeof (int));
memset (d->sdet.vp, 0, d->xsize * sizeof (float)); memset (d->sdet.vp, 0, d->xsize * sizeof (double));
memset (d->sdet.vpwr, 0, d->xsize * sizeof (float)); memset (d->sdet.vpwr, 0, d->xsize * sizeof (double));
memset (d->inbuff, 0, d->isize * sizeof (wcomplex)); memset (d->inbuff, 0, d->isize * sizeof (wcomplex));
memset (d->outbuff, 0, d->isize * sizeof (wcomplex)); memset (d->outbuff, 0, d->isize * sizeof (wcomplex));
@ -249,20 +268,20 @@ void SNBA::setSize_snba (SNBA *a, int size)
calc_snba (a); calc_snba (a);
} }
void SNBA::ATAc0 (int n, int nr, float* A, float* r) void SNBA::ATAc0 (int n, int nr, double* A, double* r)
{ {
int i, j; int i, j;
memset(r, 0, n * sizeof (float)); memset(r, 0, n * sizeof (double));
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
for (j = 0; j < nr; j++) for (j = 0; j < nr; j++)
r[i] += A[j * n + i] * A[j * n + 0]; r[i] += A[j * n + i] * A[j * n + 0];
} }
void SNBA::multA1TA2(float* a1, float* a2, int m, int n, int q, float* c) void SNBA::multA1TA2(double* a1, double* a2, int m, int n, int q, double* c)
{ {
int i, j, k; int i, j, k;
int p = q - m; int p = q - m;
memset (c, 0, m * n * sizeof (float)); memset (c, 0, m * n * sizeof (double));
for (i = 0; i < m; i++) for (i = 0; i < m; i++)
{ {
@ -282,10 +301,10 @@ void SNBA::multA1TA2(float* a1, float* a2, int m, int n, int q, float* c)
} }
} }
void SNBA::multXKE(float* a, float* xk, int m, int q, int p, float* vout) void SNBA::multXKE(double* a, double* xk, int m, int q, int p, double* vout)
{ {
int i, k; int i, k;
memset (vout, 0, m * sizeof (float)); memset (vout, 0, m * sizeof (double));
for (i = 0; i < m; i++) for (i = 0; i < m; i++)
{ {
@ -296,10 +315,10 @@ void SNBA::multXKE(float* a, float* xk, int m, int q, int p, float* vout)
} }
} }
void SNBA::multAv(float* a, float* v, int m, int q, float* vout) void SNBA::multAv(double* a, double* v, int m, int q, double* vout)
{ {
int i, k; int i, k;
memset (vout, 0, m * sizeof (float)); memset (vout, 0, m * sizeof (double));
for (i = 0; i < m; i++) for (i = 0; i < m; i++)
{ {
@ -311,29 +330,29 @@ void SNBA::multAv(float* a, float* v, int m, int q, float* vout)
void SNBA::xHat( void SNBA::xHat(
int xusize, int xusize,
int asize, int asize,
float* xk, double* xk,
float* a, double* a,
float* xout, double* xout,
float* r, double* r,
float* ATAI, double* ATAI,
float* A1, double* A1,
float* A2, double* A2,
float* P1, double* P1,
float* P2, double* P2,
float* trI_y, double* trI_y,
float* trI_v, double* trI_v,
float* dR_z double* dR_z
) )
{ {
int i, j, k; int i, j, k;
int a1rows = xusize + asize; int a1rows = xusize + asize;
int a2cols = xusize + 2 * asize; int a2cols = xusize + 2 * asize;
memset (r, 0, xusize * sizeof(float)); // work space memset (r, 0, xusize * sizeof(double)); // work space
memset (ATAI, 0, xusize * xusize * sizeof(float)); // work space memset (ATAI, 0, xusize * xusize * sizeof(double)); // work space
memset (A1, 0, a1rows * xusize * sizeof(float)); // work space memset (A1, 0, a1rows * xusize * sizeof(double)); // work space
memset (A2, 0, a1rows * a2cols * sizeof(float)); // work space memset (A2, 0, a1rows * a2cols * sizeof(double)); // work space
memset (P1, 0, xusize * a2cols * sizeof(float)); // work space memset (P1, 0, xusize * a2cols * sizeof(double)); // work space
memset (P2, 0, xusize * sizeof(float)); // work space memset (P2, 0, xusize * sizeof(double)); // work space
for (i = 0; i < xusize; i++) for (i = 0; i < xusize; i++)
{ {
@ -356,16 +375,16 @@ void SNBA::xHat(
} }
ATAc0(xusize, xusize + asize, A1, r); ATAc0(xusize, xusize + asize, A1, r);
LMath::trI(xusize, r, ATAI, trI_y, trI_v, dR_z); LMathd::trI(xusize, r, ATAI, trI_y, trI_v, dR_z);
multA1TA2(A1, A2, xusize, 2 * asize + xusize, xusize + asize, P1); multA1TA2(A1, A2, xusize, 2 * asize + xusize, xusize + asize, P1);
multXKE(P1, xk, xusize, xusize + 2 * asize, asize, P2); multXKE(P1, xk, xusize, xusize + 2 * asize, asize, P2);
multAv(ATAI, P2, xusize, xusize, xout); multAv(ATAI, P2, xusize, xusize, xout);
} }
void SNBA::invf(int xsize, int asize, float* a, float* x, float* v) void SNBA::invf(int xsize, int asize, double* a, double* x, double* v)
{ {
int i, j; int i, j;
memset (v, 0, xsize * sizeof (float)); memset (v, 0, xsize * sizeof (double));
for (i = asize; i < xsize - asize; i++) for (i = asize; i < xsize - asize; i++)
{ {
@ -381,10 +400,10 @@ void SNBA::invf(int xsize, int asize, float* a, float* x, float* v)
} }
} }
void SNBA::det(SNBA *d, int asize, float* v, int* detout) void SNBA::det(SNBA *d, int asize, double* v, int* detout)
{ {
int i, j; int i, j;
float medpwr; double medpwr;
double t1, t2; double t1, t2;
int bstate, bcount, bsamp; int bstate, bcount, bsamp;
@ -394,7 +413,7 @@ void SNBA::det(SNBA *d, int asize, float* v, int* detout)
d->sdet.vp[j] = d->sdet.vpwr[i]; d->sdet.vp[j] = d->sdet.vpwr[i];
} }
LMath::median(d->xsize - asize, d->sdet.vp, &medpwr); LMathd::median(d->xsize - asize, d->sdet.vp, &medpwr);
t1 = d->sdet.k1 * medpwr; t1 = d->sdet.k1 * medpwr;
t2 = 0.0; t2 = 0.0;
@ -566,7 +585,7 @@ int SNBA::scanFrame(
return nimp; return nimp;
} }
void SNBA::execFrame(SNBA *d, float* x) void SNBA::execFrame(SNBA *d, double* x)
{ {
int i, k; int i, k;
int pass; int pass;
@ -578,8 +597,8 @@ void SNBA::execFrame(SNBA *d, float* x)
int p_opt[MAXIMP]; int p_opt[MAXIMP];
int next = 0; int next = 0;
int p; int p;
memcpy (d->exec.savex, x, d->xsize * sizeof (float)); memcpy (d->exec.savex, x, d->xsize * sizeof (double));
LMath::asolve(d->xsize, d->exec.asize, x, d->exec.a, d->wrk.asolve_r, d->wrk.asolve_z); LMathd::asolve(d->xsize, d->exec.asize, x, d->exec.a, d->wrk.asolve_r, d->wrk.asolve_z);
invf(d->xsize, d->exec.asize, d->exec.a, x, d->exec.v); invf(d->xsize, d->exec.asize, d->exec.a, x, d->exec.v);
det(d, d->exec.asize, d->exec.v, d->exec.detout); det(d, d->exec.asize, d->exec.v, d->exec.detout);
@ -602,16 +621,16 @@ void SNBA::execFrame(SNBA *d, float* x)
if ((p = p_opt[next]) > 0) if ((p = p_opt[next]) > 0)
{ {
LMath::asolve(d->xsize, p, x, d->exec.a, d->wrk.asolve_r, d->wrk.asolve_z); LMathd::asolve(d->xsize, p, x, d->exec.a, d->wrk.asolve_r, d->wrk.asolve_z);
xHat(limp[next], p, &x[bimp[next] - p], d->exec.a, d->exec.xHout, xHat(limp[next], p, &x[bimp[next] - p], d->exec.a, d->exec.xHout,
d->wrk.xHat_r, d->wrk.xHat_ATAI, d->wrk.xHat_A1, d->wrk.xHat_A2, d->wrk.xHat_r, d->wrk.xHat_ATAI, d->wrk.xHat_A1, d->wrk.xHat_A2,
d->wrk.xHat_P1, d->wrk.xHat_P2, d->wrk.trI_y, d->wrk.trI_v, d->wrk.dR_z); d->wrk.xHat_P1, d->wrk.xHat_P2, d->wrk.trI_y, d->wrk.trI_v, d->wrk.dR_z);
memcpy (&x[bimp[next]], d->exec.xHout, limp[next] * sizeof (float)); memcpy (&x[bimp[next]], d->exec.xHout, limp[next] * sizeof (double));
memset (&d->exec.unfixed[bimp[next]], 0, limp[next] * sizeof (int)); memset (&d->exec.unfixed[bimp[next]], 0, limp[next] * sizeof (int));
} }
else else
{ {
memcpy (&x[bimp[next]], &d->exec.savex[bimp[next]], limp[next] * sizeof (float)); memcpy (&x[bimp[next]], &d->exec.savex[bimp[next]], limp[next] * sizeof (double));
} }
} }
} }
@ -634,13 +653,13 @@ void SNBA::xsnba (SNBA *d)
while (d->nsamps >= d->incr) while (d->nsamps >= d->incr)
{ {
memcpy (&d->xaux[d->xsize - d->incr], &d->inaccum[d->iaoutidx], d->incr * sizeof (float)); memcpy (&d->xaux[d->xsize - d->incr], &d->inaccum[d->iaoutidx], d->incr * sizeof (double));
execFrame (d, d->xaux); execFrame (d, d->xaux);
d->iaoutidx = (d->iaoutidx + d->incr) % d->iasize; d->iaoutidx = (d->iaoutidx + d->incr) % d->iasize;
d->nsamps -= d->incr; d->nsamps -= d->incr;
memcpy (&d->outaccum[d->oainidx], d->xaux, d->incr * sizeof (float)); memcpy (&d->outaccum[d->oainidx], d->xaux, d->incr * sizeof (double));
d->oainidx = (d->oainidx + d->incr) % d->oasize; d->oainidx = (d->oainidx + d->incr) % d->oasize;
memmove (d->xbase, &d->xbase[d->incr], (2 * d->xsize - d->incr) * sizeof (float)); memmove (d->xbase, &d->xbase[d->incr], (2 * d->xsize - d->incr) * sizeof (double));
} }
for (i = 0; i < d->isize; i++) for (i = 0; i < d->isize; i++)

83
wdsp/snba.hpp
View File

@ -48,15 +48,15 @@ public:
int iasize; int iasize;
int iainidx; int iainidx;
int iaoutidx; int iaoutidx;
float* inaccum; double* inaccum;
float* xbase; double* xbase;
float* xaux; double* xaux;
int nsamps; int nsamps;
int oasize; int oasize;
int oainidx; int oainidx;
int oaoutidx; int oaoutidx;
int init_oaoutidx; int init_oaoutidx;
float* outaccum; double* outaccum;
int resamprun; int resamprun;
int isize; int isize;
@ -67,11 +67,11 @@ public:
struct _exec struct _exec
{ {
int asize; int asize;
float* a; double* a;
float* v; double* v;
int* detout; int* detout;
float* savex; double* savex;
float* xHout; double* xHout;
int* unfixed; int* unfixed;
int npasses; int npasses;
} exec; } exec;
@ -82,8 +82,8 @@ public:
int b; int b;
int pre; int pre;
int post; int post;
float* vp; double* vp;
float* vpwr; double* vpwr;
} sdet; } sdet;
struct _scan struct _scan
{ {
@ -93,17 +93,17 @@ public:
{ {
int xHat_a1rows_max; int xHat_a1rows_max;
int xHat_a2cols_max; int xHat_a2cols_max;
float* xHat_r; double* xHat_r;
float* xHat_ATAI; double* xHat_ATAI;
float* xHat_A1; double* xHat_A1;
float* xHat_A2; double* xHat_A2;
float* xHat_P1; double* xHat_P1;
float* xHat_P2; double* xHat_P2;
float* trI_y; double* trI_y;
float* trI_v; double* trI_v;
float* dR_z; double* dR_z;
float* asolve_r; double* asolve_r;
float* asolve_z; double* asolve_z;
} wrk; } wrk;
double out_low_cut; double out_low_cut;
double out_high_cut; double out_high_cut;
@ -146,36 +146,33 @@ public:
static void SetSNBApresamps (RXA& rxa, int presamps); static void SetSNBApresamps (RXA& rxa, int presamps);
static void SetSNBApostsamps (RXA& rxa, int postsamps); static void SetSNBApostsamps (RXA& rxa, int postsamps);
static void SetSNBApmultmin (RXA& rxa, double pmultmin); static void SetSNBApmultmin (RXA& rxa, double pmultmin);
static void SetSNBAOutputBandwidth (RXA& rxa, double flow, double fhigh); static void SetSNBAOutputBandwidth (RXA& rxa, double flow, double fhigh);
private: private:
static void calc_snba (SNBA *d); static void calc_snba (SNBA *d);
static void decalc_snba (SNBA *d); static void decalc_snba (SNBA *d);
static void ATAc0 (int n, int nr, float* A, float* r); static void ATAc0 (int n, int nr, double* A, double* r);
static void multA1TA2(float* a1, float* a2, int m, int n, int q, float* c); static void multA1TA2(double* a1, double* a2, int m, int n, int q, double* c);
static void multXKE(float* a, float* xk, int m, int q, int p, float* vout); static void multXKE(double* a, double* xk, int m, int q, int p, double* vout);
static void multAv(float* a, float* v, int m, int q, float* vout); static void multAv(double* a, double* v, int m, int q, double* vout);
static void xHat( static void xHat(
int xusize, int xusize,
int asize, int asize,
float* xk, double* xk,
float* a, double* a,
float* xout, double* xout,
float* r, double* r,
float* ATAI, double* ATAI,
float* A1, double* A1,
float* A2, double* A2,
float* P1, double* P1,
float* P2, double* P2,
float* trI_y, double* trI_y,
float* trI_v, double* trI_v,
float* dR_z double* dR_z
); );
static void invf(int xsize, int asize, float* a, float* x, float* v); static void invf(int xsize, int asize, double* a, double* x, double* v);
static void det(SNBA *d, int asize, float* v, int* detout); static void det(SNBA *d, int asize, double* v, int* detout);
static int scanFrame( static int scanFrame(
int xsize, int xsize,
int pval, int pval,
@ -188,7 +185,7 @@ private:
int* p_opt, int* p_opt,
int* next int* next
); );
static void execFrame(SNBA *d, float* x); static void execFrame(SNBA *d, double* x);
}; };
} // namespace } // namespace