Miroirs/DB48X-on-DM42
1
0
Fork 0
mirror of https://github.com/c3d/DB48X-on-DM42.git synced 2024-09-28 03:20:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

arithmetic: Return angle unit for atan2

Browse source 
Like for `arg`, `atan2` returns an angle.

Fixes: #1151

Signed-off-by: Christophe de Dinechin <christophe@dinechin.org>
This commit is contained in:
Christophe de Dinechin 2024-09-01 14:37:58 +02:00
parent 3bb852224b
commit 5e4b661bdd
3 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/arithmetic.cc
View file

@ -1179,6 +1179,15 @@ algebraic_p arithmetic::evaluate(id op,
id xt = x->type();
id yt = y->type();
if (op == ID_atan2 && Settings.SetAngleUnits() &&
is_real(xt) && is_real(yt))
{
settings::SaveSetAngleUnits save(false);
x = evaluate(op, xr, yr, ops);
add_angle(x);
return x;
}
// All non-numeric cases, e.g. string concatenation
// Must come first, e.g. for optimization of X^3 or list + tagged object
while(true)

5
src/complex.cc
View file

@ -505,10 +505,9 @@ algebraic_g rectangular::pifrac() const
if (!r || !i)
return nullptr;
angle_unit mode = Settings.AngleMode();
Settings.AngleMode(object::ID_PiRadians); // Enable 'exact' optimizations
settings::SaveAngleMode sam(ID_PiRadians); // Enable 'exact' optimizations
settings::SaveSetAngleUnits ssau(false); // Do not add angle to result
algebraic_g a = atan2::evaluate(i, r);
Settings.AngleMode(mode);
return a;
}

32
src/tests.cc
View file

@ -3181,16 +3181,16 @@ void tests::decimal_numerical_functions()
step("atan2 pos / pos quadrant")
.test(CLEAR, "3.21 1.23 atan2", ENTER)
.expect("1.20487 56251 52809 23400 86691 05495 30674");
.expect("1.20487 56251 52809 23400 86691 05495 30674 r");
step("atan2 pos / neg quadrant")
.test(CLEAR, "3.21 -1.23 atan2", ENTER)
.expect("1.93671 70284 36984 00445 39742 77784 19614");
.expect("1.93671 70284 36984 00445 39742 77784 19614 r");
step("atan2 neg / pos quadrant")
.test(CLEAR, "-3.21 1.23 atan2", ENTER)
.expect("-1.20487 56251 52809 23400 86691 05495 30674");
.expect("-1.20487 56251 52809 23400 86691 05495 30674 r");
step("atan2 neg / neg quadrant")
.test(CLEAR, "-3.21 -1.23 atan2", ENTER)
.expect("-1.93671 70284 36984 00445 39742 77784 19614");
.expect("-1.93671 70284 36984 00445 39742 77784 19614 r");
step("Restore default 24-digit precision");
test(CLEAR, "24 PRECISION 12 SIG", ENTER).noerror();
@ -3354,16 +3354,16 @@ void tests::float_numerical_functions()
step("atan2 pos / pos quadrant")
.test(CLEAR, "3.21 1.23 atan2", ENTER)
.expect("1.20488");
.expect("1.20488 r");
step("atan2 pos / neg quadrant")
.test(CLEAR, "3.21 -1.23 atan2", ENTER)
.expect("1.93672");
.expect("1.93672 r");
step("atan2 neg / pos quadrant")
.test(CLEAR, "-3.21 1.23 atan2", ENTER)
.expect("-1.20488");
.expect("-1.20488 r");
step("atan2 neg / neg quadrant")
.test(CLEAR, "-3.21 -1.23 atan2", ENTER)
.expect("-1.93672");
.expect("-1.93672 r");
step("Restore default 24-digit precision");
test(CLEAR, "24 PRECISION 12 SIG SoftFP", ENTER).noerror();
@ -3521,16 +3521,16 @@ void tests::double_numerical_functions()
step("atan2 pos / pos quadrant")
.test(CLEAR, "3.21 1.23 atan2", ENTER)
.expect("1.20487 56251 5281");
.expect("1.20487 56251 5281 r");
step("atan2 pos / neg quadrant")
.test(CLEAR, "3.21 -1.23 atan2", ENTER)
.expect("1.93671 70284 3698");
.expect("1.93671 70284 3698 r");
step("atan2 neg / pos quadrant")
.test(CLEAR, "-3.21 1.23 atan2", ENTER)
.expect("-1.20487 56251 5281");
.expect("-1.20487 56251 5281 r");
step("atan2 neg / neg quadrant")
.test(CLEAR, "-3.21 -1.23 atan2", ENTER)
.expect("-1.93671 70284 3698");
.expect("-1.93671 70284 3698 r");
step("Restore default 24-digit precision");
test(CLEAR, "24 PRECISION 12 SIG SoftFP", ENTER).noerror();
@ -3685,16 +3685,16 @@ void tests::high_precision_numerical_functions()
step("atan2 pos / pos quadrant")
.test(CLEAR, "3.21 1.23 atan2", ENTER)
.expect("1.20487 56251 52809 23400 86691 05495 30674 32743 54426 68497 01001 78719 37086 47165 61508 05592 53255 02332 28917 23139 67613 92267 03142 769");
.expect("1.20487 56251 52809 23400 86691 05495 30674 32743 54426 68497 01001 78719 37086 47165 61508 05592 53255 02332 28917 23139 67613 92267 03142 769 r");
step("atan2 pos / neg quadrant")
.test(CLEAR, "3.21 -1.23 atan2", ENTER)
.expect("1.93671 70284 36984 00445 39742 77784 19614 09228 14972 69013 57207 96225 22144 30998 44778 15307 33025 32493 05294 47540 14534 16384 29680 297");
.expect("1.93671 70284 36984 00445 39742 77784 19614 09228 14972 69013 57207 96225 22144 30998 44778 15307 33025 32493 05294 47540 14534 16384 29680 297 r");
step("atan2 neg / pos quadrant")
.test(CLEAR, "-3.21 1.23 atan2", ENTER)
.expect("-1.20487 56251 52809 23400 86691 05495 30674 32743 54426 68497 01001 78719 37086 47165 61508 05592 53255 02332 28917 23139 67613 92267 03142 769");
.expect("-1.20487 56251 52809 23400 86691 05495 30674 32743 54426 68497 01001 78719 37086 47165 61508 05592 53255 02332 28917 23139 67613 92267 03142 769 r");
step("atan2 neg / neg quadrant")
.test(CLEAR, "-3.21 -1.23 atan2", ENTER)
.expect("-1.93671 70284 36984 00445 39742 77784 19614 09228 14972 69013 57207 96225 22144 30998 44778 15307 33025 32493 05294 47540 14534 16384 29680 297");
.expect("-1.93671 70284 36984 00445 39742 77784 19614 09228 14972 69013 57207 96225 22144 30998 44778 15307 33025 32493 05294 47540 14534 16384 29680 297 r");
step("Restore default 24-digit precision");
test(CLEAR, "24 PRECISION 12 SIG", ENTER).noerror();