Skip to content

refactor: use M_SQRT2 constant consistently #76

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

Merged
marton78 merged 2 commits into from
Jun 9, 2025
Merged

refactor: use M_SQRT2 constant consistently #76

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0a9bfd
refactor: use M_SQRT2 constant consistently
gunjjoshi Jun 9, 2025
616f7ad
refactor: use separate constant M_SQRT8
gunjjoshi Jun 9, 2025
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
24 changes: 7 additions & 17 deletions fftpack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,10 +856,6 @@ static void radb3(integer ido, integer l1, const real *cc, real *ch,
static void radb4(integer ido, integer l1, const real *cc, real *ch,
const real *wa1, const real *wa2, const real *wa3)
{
/* Initialized data */

static const real sqrt2 = 1.414213562373095f;

/* System generated locals */
integer cc_offset, ch_offset;

Expand Down Expand Up @@ -930,9 +926,9 @@ static void radb4(integer ido, integer l1, const real *cc, real *ch,
tr1 = cc_ref(ido, 1, k) - cc_ref(ido, 3, k);
tr2 = cc_ref(ido, 1, k) + cc_ref(ido, 3, k);
ch_ref(ido, k, 1) = tr2 + tr2;
ch_ref(ido, k, 2) = sqrt2 * (tr1 - ti1);
ch_ref(ido, k, 2) = M_SQRT2 * (tr1 - ti1);
ch_ref(ido, k, 3) = ti2 + ti2;
ch_ref(ido, k, 4) = -sqrt2 * (tr1 + ti1);
ch_ref(ido, k, 4) = -M_SQRT2 * (tr1 + ti1);
}
} /* radb4 */

Expand Down Expand Up @@ -2296,8 +2292,6 @@ static void cosqb1(integer n, real *x, real *w, real *xh)

void cosqb(integer n, real *x, real *wsave)
{
static const real tsqrt2 = 2.82842712474619f;

/* Local variables */
real x1;

Expand All @@ -2309,7 +2303,7 @@ void cosqb(integer n, real *x, real *wsave)
x[1] *= 4.f;
} else if (n == 2) {
x1 = (x[1] + x[2]) * 4.f;
x[2] = tsqrt2 * (x[1] - x[2]);
x[2] = 2 * M_SQRT2 * (x[1] - x[2]);
x[1] = x1;
} else {
cosqb1(n, &x[1], &wsave[1], &wsave[n + 1]);
Expand Down Expand Up @@ -2358,8 +2352,6 @@ static void cosqf1(integer n, real *x, real *w, real *xh)

void cosqf(integer n, real *x, real *wsave)
{
static const real sqrt2 = 1.4142135623731f;

/* Local variables */
real tsqx;

Expand All @@ -2368,7 +2360,7 @@ void cosqf(integer n, real *x, real *wsave)
--x;

if (n == 2) {
tsqx = sqrt2 * x[2];
tsqx = M_SQRT2 * x[2];
x[2] = x[1] - tsqx;
x[1] += tsqx;
} else if (n > 2) {
Expand Down Expand Up @@ -2675,7 +2667,6 @@ int main(void)
real sum1, sum2, dcfb;
integer modn;
real rftb, rftf;
real sqrt2;
real rftfb;
real costt, sintt, dcfftb, dcfftf, cosqfb, costfb;
real sinqfb;
Expand Down Expand Up @@ -2734,7 +2725,6 @@ int main(void)
/* 19. CFFTB UNNORMALIZED INVERSE OF CFFTF */


sqrt2 = sqrt(2.f);
int all_ok = 1;
for (nz = 1; nz <= (int)(sizeof nd/sizeof nd[0]); ++nz) {
n = nd[nz - 1];
Expand All @@ -2743,7 +2733,7 @@ int main(void)
np1 = n + 1;
nm1 = n - 1;
for (j = 1; j <= np1; ++j) {
x[j - 1] = sin((real) j * sqrt2);
x[j - 1] = sin((real) j * M_SQRT2);
y[j - 1] = x[j - 1];
xh[j - 1] = x[j - 1];
}
Expand Down Expand Up @@ -3007,8 +2997,8 @@ int main(void)
/* TEST CFFTI,CFFTF,CFFTB */

for (i = 1; i <= n; ++i) {
r1 = FFTPACK_COS(sqrt2 * (real) i);
r2 = FFTPACK_SIN(sqrt2 * (real) (i * i));
r1 = FFTPACK_COS(M_SQRT2 * (real) i);
r2 = FFTPACK_SIN(M_SQRT2 * (real) (i * i));
q1.r = r1, q1.i = r2;
cx[i-1].r = q1.r, cx[i-1].i = q1.i;
}
Expand Down
Loading