Skip to content
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

Jump to bottom

Avoid the performance/memory overheads of "clone on modify" of $args #1884

Merged
merged 4 commits into from Feb 27, 2021
Merged

Avoid the performance/memory overheads of "clone on modify" of $args #1884

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d65fb2
Avoid the performance/memory overheads of "clone on modify" of $args …
Feb 27, 2021
8e45e5a
Avoid the performance/memory overheads of "clone on modify" of $args …
Feb 27, 2021
f21f944
Minor refactoring
Feb 27, 2021
1b3d5d3
More refactoring
Feb 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
76 changes: 45 additions & 31 deletions src/PhpSpreadsheet/Calculation/Statistical/Conditional.php
View file
Open in desktop
Expand Up @@ -67,8 +67,8 @@ public static function AVERAGEIFS(...$args)
return self::AVERAGEIF($args[2], $args[1], $args[0]);
}

$conditions = self::buildConditionSet(...$args);
$database = self::buildDatabase(...$args);
$conditions = self::buildConditionSetForRange(...$args);
$database = self::buildDatabaseWithRange(...$args);

return DAverage::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
}
Expand Down Expand Up @@ -122,19 +122,8 @@ public static function COUNTIFS(...$args)
return self::COUNTIF(...$args);
}

$conditions = $database = [];
$pairCount = 1;
while (count($args) > 0) {
$conditions[] = array_merge([sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)], [array_pop($args)]);
$database[] = array_merge(
[sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)],
Functions::flattenArray(array_pop($args))
);
++$pairCount;
}

$conditions = array_map(null, ...$conditions);
$database = array_map(null, ...$database);
$database = self::buildDatabase(...$args);
$conditions = self::buildConditionSet(...$args);

return DCount::evaluate($database, null, $conditions);
}
Expand All @@ -157,8 +146,8 @@ public static function MAXIFS(...$args)
return 0.0;
}

$conditions = self::buildConditionSet(...$args);
$database = self::buildDatabase(...$args);
$conditions = self::buildConditionSetForRange(...$args);
$database = self::buildDatabaseWithRange(...$args);

return DMax::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
}
Expand All @@ -181,23 +170,22 @@ public static function MINIFS(...$args)
return 0.0;
}

$conditions = self::buildConditionSet(...$args);
$database = self::buildDatabase(...$args);
$conditions = self::buildConditionSetForRange(...$args);
$database = self::buildDatabaseWithRange(...$args);

return DMin::evaluate($database, self::VALUE_COLUMN_NAME, $conditions);
}

private static function buildConditionSet(...$args): array
{
array_shift($args);
$conditions = self::buildConditions(1, ...$args);

$conditions = [];
$pairCount = 1;
while (count($args) > 0) {
$conditions[] = array_merge([sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)], [array_pop($args)]);
array_pop($args);
++$pairCount;
}
return array_map(null, ...$conditions);
}

private static function buildConditionSetForRange(...$args): array
{
$conditions = self::buildConditions(2, ...$args);

if (count($conditions) === 1) {
return array_map(
Expand All @@ -211,20 +199,46 @@ function ($value) {
return array_map(null, ...$conditions);
}

private static function buildConditions(int $startOffset, ...$args): array
{
$conditions = [];

$pairCount = 1;
$argumentCount = count($args);
for ($argument = $startOffset; $argument < $argumentCount; $argument += 2) {
$conditions[] = array_merge([sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)], [$args[$argument]]);
++$pairCount;
}

return $conditions;
}

private static function buildDatabase(...$args): array
{
$database = [];

return self::buildDataSet(0, $database, ...$args);
}

private static function buildDatabaseWithRange(...$args): array
{
$database = [];
$database[] = array_merge(
[self::VALUE_COLUMN_NAME],
Functions::flattenArray(array_shift($args))
Functions::flattenArray($args[0])
);

return self::buildDataSet(1, $database, ...$args);
}

private static function buildDataSet(int $startOffset, array $database, ...$args): array
{
$pairCount = 1;
while (count($args) > 0) {
array_pop($args);
$argumentCount = count($args);
for ($argument = $startOffset; $argument < $argumentCount; $argument += 2) {
$database[] = array_merge(
[sprintf(self::CONDITIONAL_COLUMN_NAME, $pairCount)],
Functions::flattenArray(array_pop($args))
Functions::flattenArray($args[$argument])
);
++$pairCount;
}
Expand Down