mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-08-23 11:42:09 +00:00
Mark Baker
291ea88a6c
* Initial work enabling Excel function implementations for handling arrays as aguments when used in "array formulae". So far: - handling for single argument functions - for functions where only one of the arguments is an array (a matrix or a row/column vector) - for when there are two array arguments, and one is a row vector, the other a column vector - for when there are either 2 row vectors, or 2 column vectors - for a matrix and either a row or column vector Will work ok, as long as there are no more than two array arguments; still need to identify the logic to apply when there are more than two arrays; or there are two that aren't an already supported row vector/column vector pairing (ie two matrices). * Throw an exception if we have three or more array arguments (after flattening) passed to a supported function until we can identify the abstruse non-euclidian logic behind how Excel handles building, using and presenting those n-dimensional result arrays * Implement array arguments for the DATE() function so that we can verify that paired arrays/vectors work with functions that support more than 2 arguments * Implement array arguments for the many of the Math/Trig functions * Update change log
101 lines
3.3 KiB
PHP
101 lines
3.3 KiB
PHP
<?php
|
|
|
|
namespace PhpOffice\PhpSpreadsheetTests\Calculation\Functions\MathTrig;
|
|
|
|
use PhpOffice\PhpSpreadsheet\Calculation\Calculation;
|
|
|
|
class RoundUpTest extends AllSetupTeardown
|
|
{
|
|
/**
|
|
* @dataProvider providerRoundUp
|
|
*
|
|
* @param mixed $expectedResult
|
|
* @param mixed $formula
|
|
*/
|
|
public function testRoundUp($expectedResult, $formula): void
|
|
{
|
|
$this->mightHaveException($expectedResult);
|
|
$sheet = $this->getSheet();
|
|
$sheet->setCellValue('A2', 1.3);
|
|
$sheet->setCellValue('A3', 2.7);
|
|
$sheet->setCellValue('A4', -3.8);
|
|
$sheet->setCellValue('A5', -5.2);
|
|
$sheet->getCell('A1')->setValue("=ROUNDUP($formula)");
|
|
$result = $sheet->getCell('A1')->getCalculatedValue();
|
|
self::assertEqualsWithDelta($expectedResult, $result, 1E-12);
|
|
}
|
|
|
|
public function providerRoundUp(): array
|
|
{
|
|
return require 'tests/data/Calculation/MathTrig/ROUNDUP.php';
|
|
}
|
|
|
|
/**
|
|
* @dataProvider providerRoundUpArray
|
|
*/
|
|
public function testRoundUpArray(array $expectedResult, string $argument1, string $argument2): void
|
|
{
|
|
$calculation = Calculation::getInstance();
|
|
|
|
$formula = "=ROUNDUP({$argument1},{$argument2})";
|
|
$result = $calculation->_calculateFormulaValue($formula);
|
|
self::assertEqualsWithDelta($expectedResult, $result, 1.0e-14);
|
|
}
|
|
|
|
public function providerRoundUpArray(): array
|
|
{
|
|
return [
|
|
'first argument row vector' => [
|
|
[[0.146, 1.373, -931.683, 3.142]],
|
|
'{0.14527, 1.3725, -931.6829, 3.14159265}',
|
|
'3',
|
|
],
|
|
'first argument column vector' => [
|
|
[[0.146], [1.373], [-931.683], [3.142]],
|
|
'{0.14527; 1.3725; -931.6829; 3.14159265}',
|
|
'3',
|
|
],
|
|
'first argument matrix' => [
|
|
[[0.146, 1.373], [-931.683, 3.142]],
|
|
'{0.14527, 1.3725; -931.6829, 3.14159265}',
|
|
'3',
|
|
],
|
|
'second argument row vector' => [
|
|
[[0.2, 0.15, 0.146, 0.1453, 0.14527]],
|
|
'0.14527',
|
|
'{1, 2, 3, 4, 5}',
|
|
],
|
|
'second argument column vector' => [
|
|
[[0.2], [0.15], [0.146], [0.1453], [0.14527]],
|
|
'0.14527',
|
|
'{1; 2; 3; 4; 5}',
|
|
],
|
|
'second argument matrix' => [
|
|
[[0.2, 0.15], [0.146, 0.1453]],
|
|
'0.14527',
|
|
'{1, 2; 3, 4}',
|
|
],
|
|
'A row and a column vector' => [
|
|
[
|
|
[0.2, 0.15, 0.146, 0.1453],
|
|
[1.4, 1.38, 1.373, 1.3725],
|
|
[-931.7, -931.69, -931.683, -931.6829],
|
|
[3.2, 3.15, 3.142, 3.1416],
|
|
],
|
|
'{0.14527; 1.37250; -931.68290; 3.14159265}',
|
|
'{1, 2, 3, 4}',
|
|
],
|
|
'Two row vectors' => [
|
|
[[0.2, 1.38, -931.683, 3.1416]],
|
|
'{0.14527, 1.37250, -931.68290, 3.14159265}',
|
|
'{1, 2, 3, 4}',
|
|
],
|
|
'Two column vectors' => [
|
|
[[0.2], [1.38], [-931.683], [3.1416]],
|
|
'{0.14527; 1.37250; -931.68290; 3.14159265}',
|
|
'{1; 2; 3; 4}',
|
|
],
|
|
];
|
|
}
|
|
}
|