Skip to content

Commit 9ecfc0c

Browse files
author
Mark Baker
authored
Merge pull request #10 from PowerKiKi/unit-tests-bessel
Fix unit tests for BESSEL functions
2 parents 408c1a9 + 3a38cc8 commit 9ecfc0c

File tree

6 files changed

+157
-179
lines changed

6 files changed

+157
-179
lines changed

src/PhpSpreadsheet/Calculation/Engineering.php

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,9 +1022,11 @@ public static function BESSELK($x, $ord)
10221022

10231023
switch (floor($ord)) {
10241024
case 0:
1025-
return self::besselK0($x);
1025+
$fBk = self::besselK0($x);
1026+
break;
10261027
case 1:
1027-
return self::besselK1($x);
1028+
$fBk = self::besselK1($x);
1029+
break;
10281030
default:
10291031
$fTox = 2 / $x;
10301032
$fBkm = self::besselK0($x);
@@ -1106,9 +1108,11 @@ public static function BESSELY($x, $ord)
11061108

11071109
switch (floor($ord)) {
11081110
case 0:
1109-
return self::besselY0($x);
1111+
$fBy = self::besselY0($x);
1112+
break;
11101113
case 1:
1111-
return self::besselY1($x);
1114+
$fBy = self::besselY1($x);
1115+
break;
11121116
default:
11131117
$fTox = 2 / $x;
11141118
$fBym = self::besselY0($x);

unitTests/Classes/src/Calculation/EngineeringTest.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ public function tearDown()
3030

3131
/**
3232
* @dataProvider providerBESSELI
33-
* @group fail19
3433
*/
3534
public function testBESSELI()
3635
{
@@ -47,7 +46,6 @@ public function providerBESSELI()
4746

4847
/**
4948
* @dataProvider providerBESSELJ
50-
* @group fail19
5149
*/
5250
public function testBESSELJ()
5351
{
@@ -64,7 +62,6 @@ public function providerBESSELJ()
6462

6563
/**
6664
* @dataProvider providerBESSELK
67-
* @group fail19
6865
*/
6966
public function testBESSELK()
7067
{
@@ -81,7 +78,6 @@ public function providerBESSELK()
8178

8279
/**
8380
* @dataProvider providerBESSELY
84-
* @group fail19
8581
*/
8682
public function testBESSELY()
8783
{
Lines changed: 55 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,55 @@
1-
1.5, -1, "#NUM!"
2-
-1, 6, 2.2488660949282200E-05
3-
0, 3, 0.0
4-
3, 0, 4.8807925650332900
5-
1, 5, 2.7146314958504900E-04
6-
1.5, 1, 9.8166642847516600E-01
7-
-1.5, 2.5, 3.3783462087443800E-01
8-
-1.5, 14.99, 2.1218581758012900E-13
9-
1, 30, 3.5395005050254700E-42
10-
2.5, 1, 2.5167162420253600
11-
2.5, 1.5, 2.5167162420253600
12-
-2.5, 1.5, -2.5167162420253600
13-
3.5, 1, 6.2058349320630000
14-
0.7, 3, 7.3673733669342700E-03
15-
3.5, 2, 3.8320120716293600
16-
35, 2, 1.0129348967887200E+14
17-
-35, 2, 1.0129348967887200E+14
18-
-35, 3, -9.4217724797020600E+13
19-
-35, 4, 8.5141821583727800E+13
20-
1.5, "XYZ", "#VALUE!"
21-
"ABC", 3, "#VALUE!"
22-
-9, 1, -1.0309147086534900E+03
23-
-3.5, 1, -6.2058349320630000
24-
-0.735, 1, -3.9288151661176300E-01
25-
0, 1, 0.0
26-
0.035, 1, 1.7502679823335300E-02
27-
1, 1, 5.6515909758194300E-01
28-
1.5, 1, 9.8166642847516600E-01
29-
2.5, 1, 2.5167162420253600
30-
3.5, 1, 6.2058349320630000
31-
-9, 2, 8.6449622063929800E+02
32-
-3.5, 2, 3.8320120716293600
33-
-0.735, 2, 7.0619941066585700E-02
34-
0, 2, 0.0
35-
0.035, 2, 1.5314063208086000E-04
36-
0.9, 2, 1.0825972222234100E-01
37-
1, 2, 1.3574766658069900E-01
38-
1.9, 2, 6.0327243548745000E-01
39-
2.5, 2, 1.2764661588156100
40-
3.5, 2, 3.8320120716293600
41-
4, 2, 6.4221894991960900
42-
0.035, 3, 8.9329755645604500E-07
43-
0.7, 3, 7.3673733669342700E-03
44-
0.89, 3, 1.5428502532466100E-02
45-
4, 3, 3.3372758428109200
46-
4, 5, 5.0472437285149600E-01
47-
1.5, 7, 2.8406417355214300E-05
48-
3, 9, 1.3237298826652200E-04
49-
-3.5, 0, 7.3782034775718600
50-
-1.5, 0, 1.6467232021476800
51-
0, 0, 1.0
52-
1, 0, 1.2660658480342600
53-
1.5, 0, 1.6467232021476800
54-
2.5, 0, 3.2898391723912900
55-
3.5, 0, 7.3782034775718600
56-
-3.5, -1, "#NUM!"
57-
TRUE, 1, "#VALUE!"
58-
1, TRUE, "#VALUE!"
59-
21, 2, 1.0477785626593200E+08
1+
1.5, -1, "#NUM!"
2+
-1, 6, 0.00002249
3+
0, 3, 0.00000000
4+
3, 0, 4.88079259
5+
1, 5, 0.00027146
6+
1.5, 1, 0.98166643
7+
-1.5, 2.5, 0.33783462
8+
-1.5, 14.99, 0.00000000
9+
1, 30, 0.00000000
10+
2.5, 1, 2.51671625
11+
2.5, 1.5, 2.51671625
12+
-2.5, 1.5, -2.51671625
13+
3.5, 1, 6.20583492
14+
0.7, 3, 0.00736737
15+
3.5, 2, 3.83201205
16+
1.5, "XYZ", "#VALUE!"
17+
"ABC", 3, "#VALUE!"
18+
-9, 1, -1030.91472252
19+
-3.5, 1, -6.20583492
20+
-0.735, 1, -0.39288152
21+
0, 1, 0.00000000
22+
0.035, 1, 0.01750268
23+
1, 1, 0.56515910
24+
1.5, 1, 0.98166643
25+
2.5, 1, 2.51671625
26+
3.5, 1, 6.20583492
27+
-9, 2, 864.49619395
28+
-3.5, 2, 3.83201205
29+
-0.735, 2, 0.07061994
30+
0, 2, 0.00000000
31+
0.035, 2, 0.00015314
32+
0.9, 2, 0.10825973
33+
1, 2, 0.13574767
34+
1.9, 2, 0.60327243
35+
2.5, 2, 1.27646615
36+
3.5, 2, 3.83201205
37+
4, 2, 6.42218938
38+
0.035, 3, 0.00000089
39+
0.7, 3, 0.00736737
40+
0.89, 3, 0.01542850
41+
4, 3, 3.33727578
42+
4, 5, 0.50472436
43+
1.5, 7, 0.00002841
44+
3, 9, 0.00013237
45+
-3.5, 0, 7.37820343
46+
-1.5, 0, 1.64672319
47+
0, 0, 1.00000000
48+
1, 0, 1.26606588
49+
1.5, 0, 1.64672319
50+
2.5, 0, 3.28983914
51+
3.5, 0, 7.37820343
52+
-3.5, -1, "#NUM!"
53+
TRUE, 1, "#VALUE!"
54+
1, TRUE, "#VALUE!"
55+
21, 2, 104777847.71856035
Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,33 @@
1-
1.5, -1, "#NUM!"
2-
0, 1, 0.0
3-
1, 1, 4.4005058567713000E-01
4-
1, 5, 2.4975773021123400E-04
5-
1.9, 2, 3.2992582866978500E-01
6-
-2.5, 1.5, -4.9709410250442200E-01
7-
3.5, 1, 1.3737752717818600E-01
8-
0.89, 3, 1.3974004027880800E-02
9-
3.5, 2, 4.5862918476829000E-01
10-
35, 2, 1.2935945082689100E-01
11-
-35, 2, 1.2935945082689100E-01
12-
-35, 3, 2.9207004782372000E-02
13-
-35, 4, -1.3436636593244100E-01
14-
1.5, "XYZ", "#VALUE!"
15-
"ABC", 3, "#VALUE!"
16-
-3.5, 1, -1.3737752717818600E-01
17-
-0.735, 1, -3.4323577520309400E-01
18-
0, 1, 0.0
19-
0.035, 1, 1.7497320451918700E-02
20-
1.5, 1, 5.5793650789080400E-01
21-
2.5, 1, 4.9709410250442200E-01
22-
3.5, 1, 1.3737752717818600E-01
23-
-9, 2, 1.4484636919412800E-01
24-
-0.735, 2, 6.4538955636373900E-02
25-
0, 2, 0.0
26-
0.9, 2, 9.4586304292255000E-02
27-
1.9, 2, 3.2992582866978500E-01
28-
0.035, 2, 1.5310936908796500E-04
29-
3.5, 2, 4.5862918476829000E-01
30-
4, 2, 3.6412814319431200E-01
31-
0.035, 3, 8.9316078090293600E-07
32-
0.7, 3, 6.9296548267509400E-03
33-
0.89, 3, 1.3974004027880800E-02
34-
4, 3, 4.3017147115339600E-01
35-
4, 5, 1.3208665605594800E-01
36-
1.5, 7, 2.4679795788287900E-05
37-
3, 9, 8.4395021309091800E-05
1+
1.5, -1, "#NUM!"
2+
0, 1, 0.00000000
3+
1, 1, 0.44005059
4+
1, 5, 0.00024976
5+
1.9, 2, 0.32992573
6+
-2.5, 1.5, -0.49709410
7+
3.5, 1, 0.13737753
8+
0.89, 3, 0.01397400
9+
3.5, 2, 0.45862918
10+
1.5, "XYZ", "#VALUE!"
11+
"ABC", 3, "#VALUE!"
12+
-3.5, 1, -0.13737753
13+
-0.735, 1, -0.34323578
14+
0, 1, 0.00000000
15+
0.035, 1, 0.01749732
16+
1.5, 1, 0.55793651
17+
2.5, 1, 0.49709410
18+
3.5, 1, 0.13737753
19+
-9, 2, 0.14484734
20+
-0.735, 2, 0.06453896
21+
0, 2, 0.00000000
22+
0.9, 2, 0.09458630
23+
1.9, 2, 0.32992573
24+
0.035, 2, 0.00015311
25+
3.5, 2, 0.45862918
26+
4, 2, 0.36412815
27+
0.035, 3, 0.00000089
28+
0.7, 3, 0.00692965
29+
0.89, 3, 0.01397400
30+
4, 3, 0.43017147
31+
4, 5, 0.13208666
32+
1.5, 7, 0.00002468
33+
3, 9, 0.00008440
Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
1.5, -1, "#NUM!"
2-
0, 2, "#NUM!"
3-
0.1, 3, 7.9900124326586500E+03
4-
1, 0, 4.2102442108341800E-01
5-
1.5, 0, 2.1380556932365400E-01
6-
-1.5, 2, "#NUM!"
7-
1.5, 1, 2.7738780363225900E-01
8-
1.5, 2, 5.8365597416666600E-01
9-
2.3, 1.5, 9.4982447142959400E-02
10-
2.5, 1, 7.3890815650266900E-02
11-
3.5, 1, 2.2239393224640700E-02
12-
3.5, 3, 5.9161817991348200E-02
13-
3, 9, 3.9795880106238500E+02
14-
3.5, 2, 3.2307121670869000E-02
15-
1.5, "XYZ", "#VALUE!"
16-
"ABC", 3, "#VALUE!"
17-
-3.5, 1, "#NUM!"
18-
-0.735, 1, "#NUM!"
19-
0, 1, "#NUM!"
20-
0.035, 1, 2.8501970000186900E+01
21-
1.5, 1, 2.7738780363225900E-01
22-
2.5, 1, 7.3890815650266900E-02
23-
3.5, 1, 2.2239393224640700E-02
24-
-9, 2, "#NUM!"
25-
-0.735, 2, "#NUM!"
26-
0, 2, "#NUM!"
27-
0.9, 2, 2.0790271301014400
28-
1.9, 2, 2.9690930137427500E-01
29-
0.035, 2, 1.6321537072931900E+03
30-
3.5, 2, 3.2307121670869000E-02
31-
4, 2, 1.7401425543547400E-02
32-
0.035, 3, 1.8656035423207900E+05
33-
0.7, 3, 2.1972168909566600E+01
34-
0.89, 3, 1.0317473075007600E+01
35-
4, 3, 2.9884924431707800E-02
36-
4, 5, 1.5434254881392600E-01
37-
1.5, 7, 2.4577004526116700E+03
38-
3, 9, 3.9795880106238500E+02
1+
1.5, -1, "#NUM!"
2+
0, 2, "#NUM!"
3+
0.1, 3, 7990.01243278
4+
1, 0, 0.42102444
5+
1.5, 0, 0.21380557
6+
-1.5, 2, "#NUM!"
7+
1.5, 1, 0.27738780
8+
1.5, 2, 0.58365597
9+
2.3, 1.5, 0.09498245
10+
2.5, 1, 0.07389082
11+
3.5, 1, 0.02223939
12+
3.5, 3, 0.05916182
13+
3, 9, 397.95880106
14+
3.5, 2, 0.03230712
15+
1.5, "XYZ", "#VALUE!"
16+
"ABC", 3, "#VALUE!"
17+
-3.5, 1, "#NUM!"
18+
-0.735, 1, "#NUM!"
19+
0, 1, "#NUM!"
20+
0.035, 1, 28.50197000
21+
1.5, 1, 0.27738780
22+
2.5, 1, 0.07389082
23+
3.5, 1, 0.02223939
24+
-9, 2, "#NUM!"
25+
-0.735, 2, "#NUM!"
26+
0, 2, "#NUM!"
27+
0.9, 2, 2.07902715
28+
1.9, 2, 0.29690930
29+
0.035, 2, 1632.15370729
30+
3.5, 2, 0.03230712
31+
4, 2, 0.01740143
32+
0.035, 3, 186560.35423214
33+
0.7, 3, 21.97216905
34+
0.89, 3, 10.31747315
35+
4, 3, 0.02988492
36+
4, 5, 0.15434255
37+
1.5, 7, 2457.70043955
38+
3, 9, 397.95880106
Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,23 @@
1-
1.5, -1, "#NUM!"
2-
1.23, 45.67, -2.7027311261175000E+63
3-
2.5, 0, 4.9807035844668900E-01
4-
2.5, 1, 1.4591813750831300E-01
5-
2.5, 2, -3.8133584844003800E-01
6-
3.5, 1, 4.1018841662769800E-01
7-
3.5, 3, -3.5833534643622900E-01
8-
4, 2, 2.1590359910699000E-01
9-
3.5, 2, 4.5371436417535000E-02
10-
12.5, 0, -1.7121430684466900E-01
11-
12.5, 1, -1.5383825635163900E-01
12-
12.5, 2, 1.4660018586805400E-01
13-
12.5, 22, -3.5760343503878700E+02
14-
1.5, "XYZ", "#VALUE!"
15-
"ABC", 3, "#VALUE!"
16-
-3.5, 1, "#NUM!"
17-
-0.735, 1, "#NUM!"
18-
0, 1, "#NUM!"
19-
0.035, 1, -1.8233338940000000E+01
20-
1.5, 1, -4.1230862700000000E-01
21-
2.5, 1, 1.4591813800000000E-01
22-
3.5, 1, 4.1018841700000000E-01
23-
-9, 2, "#NUM!"
24-
-0.735, 2, "#NUM!"
25-
0, 2, "#NUM!"
26-
0.9, 2, -1.9459096070000000
27-
1.9, 2, -6.6987867400000000E-01
28-
0.035, 2, -1.0396979410000000E+03
29-
3.5, 2, 4.5371436000000000E-02
30-
4, 2, 2.1590359900000000E-01
31-
0.035, 3, -1.1880438840000000E+05
32-
0.7, 3, -1.5819479070000000E+01
33-
0.89, 3, -8.0204412520000000
34-
4, 3, -1.8202211000000000E-01
35-
4, 5, -7.9585141800000000E-01
36-
1.5, 7, -1.8873970340000000E+03
37-
3, 9, -4.4495950710000000E+02
1+
1.5, -1, "#NUM!"
2+
2.5, 0, 0.49807036
3+
2.5, 1, 0.14591814
4+
2.5, 2, -0.38133585
5+
3.5, 1, 0.41018842
6+
3.5, 3, -0.35833535
7+
3.5, 2, 0.04537144
8+
12.5, 0, -0.17121431
9+
1.5, "XYZ", "#VALUE!"
10+
"ABC", 3, "#VALUE!"
11+
-3.5, 1, "#NUM!"
12+
-0.735, 1, "#NUM!"
13+
0, 1, "#NUM!"
14+
1.5, 1, -0.41230863
15+
2.5, 1, 0.14591814
16+
3.5, 1, 0.41018842
17+
-9, 2, "#NUM!"
18+
-0.735, 2, "#NUM!"
19+
0, 2, "#NUM!"
20+
0.9, 2, -1.94590960
21+
1.9, 2, -0.66987868
22+
3.5, 2, 0.04537144
23+
4, 5, -0.79585142

0 commit comments

Comments
 (0)