drygdryg/calc
1
0
Fork 0
mirror of https://github.com/lcn2/calc.git synced 2025-08-16 01:03:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed 0^y for y > 0

Browse Source 
While 0^0 == 1, now for y > 0, 0^y == 0.

Adjusted cal/test8900.cal to reflect the this bug fix.

Added tests to cal/regress.cal to help verify bug fix is fixed.
This commit is contained in:
Landon Curt Noll
2022-04-07 23:54:06 -07:00
parent e9eef2dfa2
commit 56b6613da8
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cal/regress.cal
View File

@@ -305,6 +305,8 @@ print '008: parsed test_variables()';
*/ */
define test_arithmetic() define test_arithmetic()
{ {
local x;
print '400: Beginning test_arithmetic'; print '400: Beginning test_arithmetic';
vrfy(3+4==7, '401: 3 + 4 == 7'); vrfy(3+4==7, '401: 3 + 4 == 7');
@@ -366,8 +368,18 @@ define test_arithmetic()
vrfy((2^23209-1)^(2-2) == 1, '457: (2^23209-1)^(2-2) == 1'); vrfy((2^23209-1)^(2-2) == 1, '457: (2^23209-1)^(2-2) == 1');
vrfy((2^23209-1)^((2^23209-1)-(2^23209-1)) == 1, vrfy((2^23209-1)^((2^23209-1)-(2^23209-1)) == 1,
'458: (2^23209-1)^((2^23209-1)-(2^23209-1)) == 1'); '458: (2^23209-1)^((2^23209-1)-(2^23209-1)) == 1');
vrfy(0^2 == 0, '459: 0^2 == 0');
vrfy(0^3 == 0, '460: 0^3 == 0');
vrfy(0^12 == 0, '461: 0^12 == 0');
vrfy(0^13 == 0, '462: 0^13 == 0');
x = 0;
vrfy(x == 0, '463: x == 0');
vrfy(0^2 == 0, '464: 0^2 == 0');
vrfy(0^3 == 0, '465: 0^3 == 0');
vrfy(0^12 == 0, '466: 0^12 == 0');
vrfy(x^13 == 0, '467: x^13 == 0');
print '459: Ending test_arithmetic'; print '462: Ending test_arithmetic';
} }
print '009: parsed test_arithmetic()'; print '009: parsed test_arithmetic()';

12
cal/test8900.cal
View File

@@ -2058,11 +2058,17 @@ define t010()
return 5; return 5;
} }
/* /*
* Once, when an expression such as 0^(6-6) returned 0, * When an expression such as 0^(6-6) returned 0,
* then stirling2(10, 5) == 42525. However when we made9 * then stirling2(10, 5) == 42525. However when we made9
* 0^(6-6) == 0^0 == 1, then stirling2(10, 5) == 5102999/120. * 0^(6-6) == 0^0 == 1, then stirling2(10, 5) == 5102999/120
* as in:
*
* if ((stirling2(10, 5) - (5102999/120)) != 0) {
* epsilon(eps);
* return 6;
* }
*/ */
if ((stirling2(10, 5) - (5102999/120)) != 0) { if ((stirling2(10, 5) - 42525) != 0) {
epsilon(eps); epsilon(eps);
return 6; return 6;
} }

9
value.c
View File

@@ -1884,9 +1884,14 @@ powvalue(VALUE *v1, VALUE *v2, VALUE *vres)
*vres = error_value(E_1OVER0); *vres = error_value(E_1OVER0);
break; break;
} }
/* 0 ^ non-neg is 1, including 0^0 */
vres->v_type = V_NUM; vres->v_type = V_NUM;
vres->v_num = qlink(&_qone_); if (qiszero(v2->v_num)) {
/* 0 ^ 0 is 1 */
vres->v_num = qlink(&_qone_);
} else {
/* 0 ^ (exp>0) is 0 */
vres->v_num = qlink(&_qzero_);
}
} else if (qisint(real_v2)) { } else if (qisint(real_v2)) {
vres->v_num = qpowi(v1->v_num, real_v2); vres->v_num = qpowi(v1->v_num, real_v2);
} else { } else {