Page MenuHomePhabricator
Files F15444119

D20454.id48805.diff
No OneTemporary
Actions

D20454.id48805.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2097,6 +2097,7 @@
'PhabricatorAccessLog' => 'infrastructure/log/PhabricatorAccessLog.php',
'PhabricatorAccessLogConfigOptions' => 'applications/config/option/PhabricatorAccessLogConfigOptions.php',
'PhabricatorAccessibilitySetting' => 'applications/settings/setting/PhabricatorAccessibilitySetting.php',
+ 'PhabricatorAccumulateChartFunction' => 'applications/fact/chart/PhabricatorAccumulateChartFunction.php',
'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php',
'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php',
'PhabricatorActivitySettingsPanel' => 'applications/settings/panel/PhabricatorActivitySettingsPanel.php',
@@ -2649,6 +2650,7 @@
'PhabricatorChartFunction' => 'applications/fact/chart/PhabricatorChartFunction.php',
'PhabricatorChartFunctionArgument' => 'applications/fact/chart/PhabricatorChartFunctionArgument.php',
'PhabricatorChartFunctionArgumentParser' => 'applications/fact/chart/PhabricatorChartFunctionArgumentParser.php',
+ 'PhabricatorChartFunctionChain' => 'applications/fact/chart/PhabricatorChartFunctionChain.php',
'PhabricatorChatLogApplication' => 'applications/chatlog/application/PhabricatorChatLogApplication.php',
'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php',
'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
@@ -4709,6 +4711,7 @@
'PhabricatorSubscriptionsUIEventListener' => 'applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php',
'PhabricatorSubscriptionsUnsubscribeEmailCommand' => 'applications/subscriptions/command/PhabricatorSubscriptionsUnsubscribeEmailCommand.php',
'PhabricatorSubtypeEditEngineExtension' => 'applications/transactions/engineextension/PhabricatorSubtypeEditEngineExtension.php',
+ 'PhabricatorSumChartFunction' => 'applications/fact/chart/PhabricatorSumChartFunction.php',
'PhabricatorSupportApplication' => 'applications/support/application/PhabricatorSupportApplication.php',
'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
'PhabricatorSyntaxHighlightingConfigOptions' => 'applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php',
@@ -4936,7 +4939,6 @@
'PhabricatorWorkingCopyDiscoveryTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php',
'PhabricatorWorkingCopyPullTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php',
'PhabricatorWorkingCopyTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php',
- 'PhabricatorXChartFunction' => 'applications/fact/chart/PhabricatorXChartFunction.php',
'PhabricatorXHPASTDAO' => 'applications/phpast/storage/PhabricatorXHPASTDAO.php',
'PhabricatorXHPASTParseTree' => 'applications/phpast/storage/PhabricatorXHPASTParseTree.php',
'PhabricatorXHPASTViewController' => 'applications/phpast/controller/PhabricatorXHPASTViewController.php',
@@ -7961,6 +7963,7 @@
'PhabricatorAccessLog' => 'Phobject',
'PhabricatorAccessLogConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorAccessibilitySetting' => 'PhabricatorSelectSetting',
+ 'PhabricatorAccumulateChartFunction' => 'PhabricatorChartFunction',
'PhabricatorActionListView' => 'AphrontTagView',
'PhabricatorActionView' => 'AphrontView',
'PhabricatorActivitySettingsPanel' => 'PhabricatorSettingsPanel',
@@ -8624,6 +8627,7 @@
'PhabricatorChartFunction' => 'Phobject',
'PhabricatorChartFunctionArgument' => 'Phobject',
'PhabricatorChartFunctionArgumentParser' => 'Phobject',
+ 'PhabricatorChartFunctionChain' => 'Phobject',
'PhabricatorChatLogApplication' => 'PhabricatorApplication',
'PhabricatorChatLogChannel' => array(
'PhabricatorChatLogDAO',
@@ -11021,6 +11025,7 @@
'PhabricatorSubscriptionsUIEventListener' => 'PhabricatorEventListener',
'PhabricatorSubscriptionsUnsubscribeEmailCommand' => 'MetaMTAEmailTransactionCommand',
'PhabricatorSubtypeEditEngineExtension' => 'PhabricatorEditEngineExtension',
+ 'PhabricatorSumChartFunction' => 'PhabricatorChartFunction',
'PhabricatorSupportApplication' => 'PhabricatorApplication',
'PhabricatorSyntaxHighlighter' => 'Phobject',
'PhabricatorSyntaxHighlightingConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -11291,7 +11296,6 @@
'PhabricatorWorkingCopyDiscoveryTestCase' => 'PhabricatorWorkingCopyTestCase',
'PhabricatorWorkingCopyPullTestCase' => 'PhabricatorWorkingCopyTestCase',
'PhabricatorWorkingCopyTestCase' => 'PhabricatorTestCase',
- 'PhabricatorXChartFunction' => 'PhabricatorChartFunction',
'PhabricatorXHPASTDAO' => 'PhabricatorLiskDAO',
'PhabricatorXHPASTParseTree' => 'PhabricatorXHPASTDAO',
'PhabricatorXHPASTViewController' => 'PhabricatorController',
diff --git a/src/applications/fact/chart/PhabricatorAccumulateChartFunction.php b/src/applications/fact/chart/PhabricatorAccumulateChartFunction.php
new file mode 100644
--- /dev/null
+++ b/src/applications/fact/chart/PhabricatorAccumulateChartFunction.php
@@ -0,0 +1,81 @@
+<?php
+
+final class PhabricatorAccumulateChartFunction
+ extends PhabricatorChartFunction {
+
+ const FUNCTIONKEY = 'accumulate';
+
+ protected function newArguments() {
+ return array(
+ $this->newArgument()
+ ->setName('x')
+ ->setType('function'),
+ );
+ }
+
+ public function getDomain() {
+ return $this->getArgument('x')->getDomain();
+ }
+
+ public function newInputValues(PhabricatorChartDataQuery $query) {
+ return $this->getArgument('x')->newInputValues($query);
+ }
+
+ public function evaluateFunction(array $xv) {
+ // First, we're going to accumulate the underlying function. Then
+ // we'll map the inputs through the accumulation.
+
+ $datasource = $this->getArgument('x');
+
+ // Use an unconstrained query to pull all the data from the underlying
+ // source. We need to accumulate data since the beginning of time to
+ // figure out the right Y-intercept -- otherwise, we'll always start at
+ // "0" wherever our domain begins.
+ $empty_query = new PhabricatorChartDataQuery();
+
+ $datasource_xv = $datasource->newInputValues($empty_query);
+ if (!$datasource_xv) {
+ // TODO: Maybe this should just be an error?
+ $datasource_xv = $xv;
+ }
+
+ $yv = $datasource->evaluateFunction($datasource_xv);
+
+ $map = array_combine($datasource_xv, $yv);
+
+ $accumulator = 0;
+ foreach ($map as $x => $y) {
+ $accumulator += $y;
+ $map[$x] = $accumulator;
+ }
+
+ // The value of "accumulate(x)" is largest datapoint in the map which is
+ // no larger than "x".
+
+ $map_x = array_keys($map);
+ $idx = -1;
+ $max = count($map_x) - 1;
+
+ $yv = array();
+
+ $value = 0;
+ foreach ($xv as $x) {
+ // While the next "x" we need to evaluate the function at lies to the
+ // right of the next datapoint, move the current datapoint forward until
+ // we're at the rightmost datapoint which is not larger than "x".
+ while ($idx < $max) {
+ if ($map_x[$idx + 1] > $x) {
+ break;
+ }
+
+ $idx++;
+ $value = $map[$map_x[$idx]];
+ }
+
+ $yv[] = $value;
+ }
+
+ return $yv;
+ }
+
+}
diff --git a/src/applications/fact/chart/PhabricatorChartDataQuery.php b/src/applications/fact/chart/PhabricatorChartDataQuery.php
--- a/src/applications/fact/chart/PhabricatorChartDataQuery.php
+++ b/src/applications/fact/chart/PhabricatorChartDataQuery.php
@@ -34,4 +34,48 @@
return $this->limit;
}
+ public function selectInputValues(array $xv) {
+ $result = array();
+
+ $x_min = $this->getMinimumValue();
+ $x_max = $this->getMaximumValue();
+ $limit = $this->getLimit();
+
+ if ($x_min !== null) {
+ foreach ($xv as $key => $x) {
+ if ($x < $x_min) {
+ unset($xv[$key]);
+ }
+ }
+ }
+
+ if ($x_max !== null) {
+ foreach ($xv as $key => $x) {
+ if ($x > $x_max) {
+ unset($xv[$key]);
+ }
+ }
+ }
+
+ // If we have too many data points, throw away some of the data.
+
+ // TODO: This doesn't work especially well right now.
+
+ if ($limit !== null) {
+ $count = count($xv);
+ if ($count > $limit) {
+ $ii = 0;
+ $every = ceil($count / $limit);
+ foreach ($xv as $key => $x) {
+ $ii++;
+ if (($ii % $every) && ($ii != $count)) {
+ unset($xv[$key]);
+ }
+ }
+ }
+ }
+
+ return array_values($xv);
+ }
+
}
diff --git a/src/applications/fact/chart/PhabricatorChartFunction.php b/src/applications/fact/chart/PhabricatorChartFunction.php
--- a/src/applications/fact/chart/PhabricatorChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorChartFunction.php
@@ -3,11 +3,7 @@
abstract class PhabricatorChartFunction
extends Phobject {
- private $xAxis;
- private $yAxis;
-
private $argumentParser;
- private $sourceFunction;
final public function getFunctionKey() {
return $this->getPhobjectClassConstant('FUNCTIONKEY', 32);
@@ -44,13 +40,28 @@
$parser->setHaveAllArguments(true);
$parser->parseArguments();
- $source_argument = $parser->getSourceFunctionArgument();
- if ($source_argument) {
- $source_function = $this->getArgument($source_argument->getName());
- $this->setSourceFunction($source_function);
+ return $this;
+ }
+
+ public function selectAllFunctions() {
+ $result = array();
+ $result[] = $this;
+
+ $parser = $this->getArgumentParser();
+ foreach ($parser->getAllArguments() as $argument) {
+ if ($argument->getType() !== 'function') {
+ continue;
+ }
+
+ $name = $argument->getName();
+ $value = $this->getArgument($name);
+
+ foreach ($value->selectAllFunctions() as $subfunction) {
+ $result[] = $subfunction;
+ }
}
- return $this;
+ return $result;
}
abstract protected function newArguments();
@@ -73,145 +84,18 @@
return $this->argumentParser;
}
- public function loadData() {
- return;
- }
-
- protected function setSourceFunction(PhabricatorChartFunction $source) {
- $this->sourceFunction = $source;
- return $this;
- }
-
- protected function getSourceFunction() {
- return $this->sourceFunction;
- }
-
- final public function setXAxis(PhabricatorChartAxis $x_axis) {
- $this->xAxis = $x_axis;
- return $this;
- }
-
- final public function getXAxis() {
- return $this->xAxis;
- }
-
- final public function setYAxis(PhabricatorChartAxis $y_axis) {
- $this->yAxis = $y_axis;
- return $this;
- }
-
- final public function getYAxis() {
- return $this->yAxis;
- }
-
- protected function canEvaluateFunction() {
- return false;
- }
-
- protected function evaluateFunction($x) {
- throw new PhutilMethodNotImplementedException();
- }
-
- public function hasDomain() {
- if ($this->canEvaluateFunction()) {
- return false;
- }
-
- throw new PhutilMethodNotImplementedException();
- }
-
- public function getDatapoints(PhabricatorChartDataQuery $query) {
- if ($this->canEvaluateFunction()) {
- $points = $this->newSourceDatapoints($query);
- foreach ($points as $key => $point) {
- $y = $point['y'];
- $y = $this->evaluateFunction($y);
- $points[$key]['y'] = $y;
- }
-
- return $points;
- }
-
- return $this->newDatapoints($query);
- }
-
- protected function newDatapoints(PhabricatorChartDataQuery $query) {
- throw new PhutilMethodNotImplementedException();
- }
-
- protected function newSourceDatapoints(PhabricatorChartDataQuery $query) {
- $source = $this->getSourceFunction();
- if ($source) {
- return $source->getDatapoints($query);
- }
+ abstract public function evaluateFunction(array $xv);
- return $this->newDefaultDatapoints($query);
+ public function getDomain() {
+ return null;
}
- protected function newDefaultDatapoints(PhabricatorChartDataQuery $query) {
- $x_min = $query->getMinimumValue();
- $x_max = $query->getMaximumValue();
- $limit = $query->getLimit();
-
- $points = array();
- $steps = $this->newLinearSteps($x_min, $x_max, $limit);
- foreach ($steps as $step) {
- $points[] = array(
- 'x' => $step,
- 'y' => $step,
- );
- }
-
- return $points;
+ public function newInputValues(PhabricatorChartDataQuery $query) {
+ return null;
}
- protected function newLinearSteps($src, $dst, $count) {
- $count = (int)$count;
- $src = (int)$src;
- $dst = (int)$dst;
-
- if ($count === 0) {
- throw new Exception(
- pht('Can not generate zero linear steps between two values!'));
- }
-
- if ($src === $dst) {
- return array($src);
- }
-
- if ($count === 1) {
- return array($src);
- }
-
- $is_reversed = ($src > $dst);
- if ($is_reversed) {
- $min = (double)$dst;
- $max = (double)$src;
- } else {
- $min = (double)$src;
- $max = (double)$dst;
- }
-
- $step = (double)($max - $min) / (double)($count - 1);
-
- $steps = array();
- for ($cursor = $min; $cursor <= $max; $cursor += $step) {
- $x = (int)round($cursor);
-
- if (isset($steps[$x])) {
- continue;
- }
-
- $steps[$x] = $x;
- }
-
- $steps = array_values($steps);
-
- if ($is_reversed) {
- $steps = array_reverse($steps);
- }
-
- return $steps;
+ public function loadData() {
+ return;
}
}
diff --git a/src/applications/fact/chart/PhabricatorChartFunctionArgument.php b/src/applications/fact/chart/PhabricatorChartFunctionArgument.php
--- a/src/applications/fact/chart/PhabricatorChartFunctionArgument.php
+++ b/src/applications/fact/chart/PhabricatorChartFunctionArgument.php
@@ -5,7 +5,6 @@
private $name;
private $type;
- private $isSourceFunction;
public function setName($name) {
$this->name = $name;
@@ -40,15 +39,6 @@
return $this->type;
}
- public function setIsSourceFunction($is_source_function) {
- $this->isSourceFunction = $is_source_function;
- return $this;
- }
-
- public function getIsSourceFunction() {
- return $this->isSourceFunction;
- }
-
public function newValue($value) {
switch ($this->getType()) {
case 'fact-key':
diff --git a/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php b/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php
--- a/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php
+++ b/src/applications/fact/chart/PhabricatorChartFunctionArgumentParser.php
@@ -72,6 +72,10 @@
return $this;
}
+ public function getAllArguments() {
+ return array_values($this->argumentMap);
+ }
+
public function parseArguments() {
$have_count = count($this->rawArguments);
$want_count = count($this->argumentMap);
@@ -151,43 +155,4 @@
implode(', ', $argument_list));
}
- public function getSourceFunctionArgument() {
- $required_type = 'function';
-
- $sources = array();
- foreach ($this->argumentMap as $key => $argument) {
- if (!$argument->getIsSourceFunction()) {
- continue;
- }
-
- if ($argument->getType() !== $required_type) {
- throw new Exception(
- pht(
- 'Function "%s" defines an argument "%s" which is marked as a '.
- 'source function, but the type of this argument is not "%s".',
- $this->getFunctionArgumentSignature(),
- $argument->getName(),
- $required_type));
- }
-
- $sources[$key] = $argument;
- }
-
- if (!$sources) {
- return null;
- }
-
- if (count($sources) > 1) {
- throw new Exception(
- pht(
- 'Function "%s" defines more than one argument as a source '.
- 'function (arguments: %s). Functions must have zero or one '.
- 'source function.',
- $this->getFunctionArgumentSignature(),
- implode(', ', array_keys($sources))));
- }
-
- return head($sources);
- }
-
}
diff --git a/src/applications/fact/chart/PhabricatorChartFunctionChain.php b/src/applications/fact/chart/PhabricatorChartFunctionChain.php
new file mode 100644
--- /dev/null
+++ b/src/applications/fact/chart/PhabricatorChartFunctionChain.php
@@ -0,0 +1,130 @@
+<?php
+
+final class PhabricatorChartFunctionChain
+ extends Phobject {
+
+ private $functions = array();
+
+ public function addFunction(PhabricatorChartFunction $function) {
+ $this->functions[] = $function;
+ return $this;
+ }
+
+ public function getFunctions() {
+ return $this->functions;
+ }
+
+ public function getDatapoints(PhabricatorChartDataQuery $query) {
+ $functions = $this->getFunctions();
+
+ $xv = null;
+
+ foreach ($functions as $function) {
+ $xv = $function->newInputValues($query);
+ if ($xv !== null) {
+ break;
+ }
+ }
+
+ if ($xv === null) {
+ $xv = $this->newDefaultInputValues($query);
+ }
+
+ $xv = $query->selectInputValues($xv);
+
+ $n = count($xv);
+
+ $yv = $xv;
+ foreach ($functions as $function) {
+ $yv = $function->evaluateFunction($yv);
+ }
+
+ $points = array();
+ for ($ii = 0; $ii < $n; $ii++) {
+ $y = $yv[$ii];
+
+ if ($y === null) {
+ continue;
+ }
+
+ $points[] = array(
+ 'x' => $xv[$ii],
+ 'y' => $y,
+ );
+ }
+
+ return $points;
+ }
+
+ public function getDomain() {
+ $functions = $this->getFunctions();
+
+ foreach ($functions as $function) {
+ $domain = $function->getDomain();
+ if ($domain !== null) {
+ return $domain;
+ }
+ }
+
+ return array(null, null);
+ }
+
+ protected function newDefaultInputValues(PhabricatorChartDataQuery $query) {
+ $x_min = $query->getMinimumValue();
+ $x_max = $query->getMaximumValue();
+ $limit = $query->getLimit();
+
+ return $this->newLinearSteps($x_min, $x_max, $limit);
+ }
+
+ protected function newLinearSteps($src, $dst, $count) {
+ $count = (int)$count;
+ $src = (int)$src;
+ $dst = (int)$dst;
+
+ if ($count === 0) {
+ throw new Exception(
+ pht('Can not generate zero linear steps between two values!'));
+ }
+
+ if ($src === $dst) {
+ return array($src);
+ }
+
+ if ($count === 1) {
+ return array($src);
+ }
+
+ $is_reversed = ($src > $dst);
+ if ($is_reversed) {
+ $min = (double)$dst;
+ $max = (double)$src;
+ } else {
+ $min = (double)$src;
+ $max = (double)$dst;
+ }
+
+ $step = (double)($max - $min) / (double)($count - 1);
+
+ $steps = array();
+ for ($cursor = $min; $cursor <= $max; $cursor += $step) {
+ $x = (int)round($cursor);
+
+ if (isset($steps[$x])) {
+ continue;
+ }
+
+ $steps[$x] = $x;
+ }
+
+ $steps = array_values($steps);
+
+ if ($is_reversed) {
+ $steps = array_reverse($steps);
+ }
+
+ return $steps;
+ }
+
+
+}
diff --git a/src/applications/fact/chart/PhabricatorConstantChartFunction.php b/src/applications/fact/chart/PhabricatorConstantChartFunction.php
--- a/src/applications/fact/chart/PhabricatorConstantChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorConstantChartFunction.php
@@ -13,12 +13,16 @@
);
}
- protected function canEvaluateFunction() {
- return true;
- }
+ public function evaluateFunction(array $xv) {
+ $n = $this->getArgument('n');
+
+ $yv = array();
+
+ foreach ($xv as $x) {
+ $yv[] = $n;
+ }
- protected function evaluateFunction($x) {
- return $this->getArgument('n');
+ return $yv;
}
}
diff --git a/src/applications/fact/chart/PhabricatorCosChartFunction.php b/src/applications/fact/chart/PhabricatorCosChartFunction.php
--- a/src/applications/fact/chart/PhabricatorCosChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorCosChartFunction.php
@@ -6,20 +6,17 @@
const FUNCTIONKEY = 'cos';
protected function newArguments() {
- return array(
- $this->newArgument()
- ->setName('x')
- ->setType('function')
- ->setIsSourceFunction(true),
- );
+ return array();
}
- protected function canEvaluateFunction() {
- return true;
- }
+ public function evaluateFunction(array $xv) {
+ $yv = array();
+
+ foreach ($xv as $x) {
+ $yv[] = cos(deg2rad($x));
+ }
- protected function evaluateFunction($x) {
- return cos(deg2rad($x));
+ return $yv;
}
}
diff --git a/src/applications/fact/chart/PhabricatorFactChartFunction.php b/src/applications/fact/chart/PhabricatorFactChartFunction.php
--- a/src/applications/fact/chart/PhabricatorFactChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorFactChartFunction.php
@@ -6,7 +6,7 @@
const FUNCTIONKEY = 'fact';
private $fact;
- private $datapoints;
+ private $map;
protected function newArguments() {
$key_argument = $this->newArgument()
@@ -44,73 +44,46 @@
return;
}
- $points = array();
+ $map = array();
+ foreach ($data as $row) {
+ $value = (int)$row['value'];
+ $epoch = (int)$row['epoch'];
- $sum = 0;
- foreach ($data as $key => $row) {
- $sum += (int)$row['value'];
- $points[] = array(
- 'x' => (int)$row['epoch'],
- 'y' => $sum,
- );
+ if (!isset($map[$epoch])) {
+ $map[$epoch] = 0;
+ }
+
+ $map[$epoch] += $value;
}
- $this->datapoints = $points;
+ $this->map = $map;
}
- public function getDatapoints(PhabricatorChartDataQuery $query) {
- $points = $this->datapoints;
- if (!$points) {
- return array();
- }
+ public function getDomain() {
+ return array(
+ head_key($this->map),
+ last_key($this->map),
+ );
+ }
- $x_min = $query->getMinimumValue();
- $x_max = $query->getMaximumValue();
- $limit = $query->getLimit();
+ public function newInputValues(PhabricatorChartDataQuery $query) {
+ return array_keys($this->map);
+ }
- if ($x_min !== null) {
- foreach ($points as $key => $point) {
- if ($point['x'] < $x_min) {
- unset($points[$key]);
- }
- }
- }
+ public function evaluateFunction(array $xv) {
+ $map = $this->map;
- if ($x_max !== null) {
- foreach ($points as $key => $point) {
- if ($point['x'] > $x_max) {
- unset($points[$key]);
- }
- }
- }
+ $yv = array();
- // If we have too many data points, throw away some of the data.
- if ($limit !== null) {
- $count = count($points);
- if ($count > $limit) {
- $ii = 0;
- $every = ceil($count / $limit);
- foreach ($points as $key => $point) {
- $ii++;
- if (($ii % $every) && ($ii != $count)) {
- unset($points[$key]);
- }
- }
+ foreach ($xv as $x) {
+ if (isset($map[$x])) {
+ $yv[] = $map[$x];
+ } else {
+ $yv[] = null;
}
}
- return $points;
- }
-
- public function hasDomain() {
- return true;
- }
-
- public function getDomain() {
- // TODO: We can examine the data to fit a better domain.
-
- $now = PhabricatorTime::getNow();
- return array($now - phutil_units('90 days in seconds'), $now);
+ return $yv;
}
}
diff --git a/src/applications/fact/chart/PhabricatorScaleChartFunction.php b/src/applications/fact/chart/PhabricatorScaleChartFunction.php
--- a/src/applications/fact/chart/PhabricatorScaleChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorScaleChartFunction.php
@@ -7,22 +7,22 @@
protected function newArguments() {
return array(
- $this->newArgument()
- ->setName('x')
- ->setType('function')
- ->setIsSourceFunction(true),
$this->newArgument()
->setName('scale')
->setType('number'),
);
}
- protected function canEvaluateFunction() {
- return true;
- }
+ public function evaluateFunction(array $xv) {
+ $scale = $this->getArgument('scale');
+
+ $yv = array();
+
+ foreach ($xv as $x) {
+ $yv[] = $x * $scale;
+ }
- protected function evaluateFunction($x) {
- return $x * $this->getArgument('scale');
+ return $yv;
}
}
diff --git a/src/applications/fact/chart/PhabricatorShiftChartFunction.php b/src/applications/fact/chart/PhabricatorShiftChartFunction.php
--- a/src/applications/fact/chart/PhabricatorShiftChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorShiftChartFunction.php
@@ -7,22 +7,22 @@
protected function newArguments() {
return array(
- $this->newArgument()
- ->setName('x')
- ->setType('function')
- ->setIsSourceFunction(true),
$this->newArgument()
->setName('shift')
->setType('number'),
);
}
- protected function canEvaluateFunction() {
- return true;
- }
+ public function evaluateFunction(array $xv) {
+ $shift = $this->getArgument('shift');
+
+ $yv = array();
+
+ foreach ($xv as $x) {
+ $yv[] = $x + $shift;
+ }
- protected function evaluateFunction($x) {
- return $x * $this->getArgument('shift');
+ return $yv;
}
}
diff --git a/src/applications/fact/chart/PhabricatorSinChartFunction.php b/src/applications/fact/chart/PhabricatorSinChartFunction.php
--- a/src/applications/fact/chart/PhabricatorSinChartFunction.php
+++ b/src/applications/fact/chart/PhabricatorSinChartFunction.php
@@ -6,20 +6,17 @@
const FUNCTIONKEY = 'sin';
protected function newArguments() {
- return array(
- $this->newArgument()
- ->setName('x')
- ->setType('function')
- ->setIsSourceFunction(true),
- );
+ return array();
}
- protected function canEvaluateFunction() {
- return true;
- }
+ public function evaluateFunction(array $xv) {
+ $yv = array();
+
+ foreach ($xv as $x) {
+ $yv[] = sin(deg2rad($x));
+ }
- protected function evaluateFunction($x) {
- return sin(deg2rad($x));
+ return $yv;
}
}
diff --git a/src/applications/fact/chart/PhabricatorSumChartFunction.php b/src/applications/fact/chart/PhabricatorSumChartFunction.php
new file mode 100644
--- /dev/null
+++ b/src/applications/fact/chart/PhabricatorSumChartFunction.php
@@ -0,0 +1,95 @@
+<?php
+
+final class PhabricatorSumChartFunction
+ extends PhabricatorChartFunction {
+
+ const FUNCTIONKEY = 'sum';
+
+ protected function newArguments() {
+ return array(
+ $this->newArgument()
+ ->setName('u')
+ ->setType('function'),
+ $this->newArgument()
+ ->setName('v')
+ ->setType('function'),
+ );
+ }
+
+ private function getFunctions() {
+ return array(
+ $this->getArgument('u'),
+ $this->getArgument('v'),
+ );
+ }
+
+ public function getDomain() {
+ $minv = array();
+ $maxv = array();
+ foreach ($this->getFunctions() as $function) {
+ $domain = $function->getDomain();
+ if ($domain !== null) {
+ list($min, $max) = $domain;
+ $minv[] = $min;
+ $maxv[] = $max;
+ }
+ }
+
+ if (!$minv && !$maxv) {
+ return null;
+ }
+
+ $min = null;
+ $max = null;
+
+ if ($minv) {
+ $min = min($minv);
+ }
+
+ if ($maxv) {
+ $max = max($maxv);
+ }
+
+ return array($min, $max);
+ }
+
+ public function newInputValues(PhabricatorChartDataQuery $query) {
+ $map = array();
+ foreach ($this->getFunctions() as $function) {
+ $xv = $function->newInputValues($query);
+ if ($xv !== null) {
+ foreach ($xv as $x) {
+ $map[$x] = true;
+ }
+ }
+ }
+
+ ksort($map);
+
+ return array_keys($map);
+ }
+
+ public function evaluateFunction(array $xv) {
+ $fv = array();
+ foreach ($this->getFunctions() as $function) {
+ $fv[] = $function->evaluateFunction($xv);
+ }
+
+ $n = count($xv);
+ $yv = array_fill(0, $n, null);
+
+ foreach ($fv as $f) {
+ for ($ii = 0; $ii < $n; $ii++) {
+ if ($f[$ii] !== null) {
+ if (!isset($yv[$ii])) {
+ $yv[$ii] = 0;
+ }
+ $yv[$ii] += $f[$ii];
+ }
+ }
+ }
+
+ return $yv;
+ }
+
+}
diff --git a/src/applications/fact/chart/PhabricatorXChartFunction.php b/src/applications/fact/chart/PhabricatorXChartFunction.php
deleted file mode 100644
--- a/src/applications/fact/chart/PhabricatorXChartFunction.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-final class PhabricatorXChartFunction
- extends PhabricatorChartFunction {
-
- const FUNCTIONKEY = 'x';
-
- protected function newArguments() {
- return array();
- }
-
- protected function canEvaluateFunction() {
- return true;
- }
-
- protected function evaluateFunction($x) {
- return $x;
- }
-
-}
diff --git a/src/applications/fact/controller/PhabricatorFactChartController.php b/src/applications/fact/controller/PhabricatorFactChartController.php
--- a/src/applications/fact/controller/PhabricatorFactChartController.php
+++ b/src/applications/fact/controller/PhabricatorFactChartController.php
@@ -12,45 +12,97 @@
$is_chart_mode = ($mode === 'chart');
$is_draw_mode = ($mode === 'draw');
- $functions = array();
-
- $functions[] = id(new PhabricatorFactChartFunction())
+ $count_function = id(new PhabricatorFactChartFunction())
->setArguments(array('tasks.count.create'));
- $functions[] = id(new PhabricatorFactChartFunction())
+ $open_function = id(new PhabricatorFactChartFunction())
->setArguments(array('tasks.open-count.create'));
- $x_function = id(new PhabricatorXChartFunction())
- ->setArguments(array());
-
- $functions[] = id(new PhabricatorConstantChartFunction())
+ $const_function = id(new PhabricatorConstantChartFunction())
->setArguments(array(360));
- $functions[] = id(new PhabricatorSinChartFunction())
- ->setArguments(array($x_function));
+ $sin_function = id(new PhabricatorSinChartFunction())
+ ->setArguments(array());
$cos_function = id(new PhabricatorCosChartFunction())
- ->setArguments(array($x_function));
+ ->setArguments(array());
+
+ $scale_1000 = id(new PhabricatorScaleChartFunction())
+ ->setArguments(array(0.001));
+
+ $scale_10 = id(new PhabricatorScaleChartFunction())
+ ->setArguments(array(10));
+
+ $shift_50 = id(new PhabricatorShiftChartFunction())
+ ->setArguments(array(50));
+
+ $chains = array();
+
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($scale_1000)
+ ->addFunction($cos_function)
+ ->addFunction($scale_10)
+ ->addFunction($shift_50);
+
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($count_function);
+
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($open_function);
+
+ $accumulate_count = id(new PhabricatorAccumulateChartFunction())
+ ->setArguments(
+ array(
+ $count_function,
+ ));
+
+ $accumulate_open = id(new PhabricatorAccumulateChartFunction())
+ ->setArguments(
+ array(
+ $open_function,
+ ));
+
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($accumulate_count);
- $functions[] = id(new PhabricatorShiftChartFunction())
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($accumulate_open);
+
+ $sum_function = id(new PhabricatorSumChartFunction())
->setArguments(
array(
- array(
- 'scale',
- array(
- 'cos',
- array(
- 'scale',
- array('x'),
- 0.001,
- ),
- ),
- 10,
- ),
- 200,
+ $accumulate_open,
+ $accumulate_count,
));
- list($domain_min, $domain_max) = $this->getDomain($functions);
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($sum_function);
+
+ $sum_raw_function = id(new PhabricatorSumChartFunction())
+ ->setArguments(
+ array(
+ $open_function,
+ $count_function,
+ ));
+
+ $accumulate_raw_function = id(new PhabricatorAccumulateChartFunction())
+ ->setArguments(
+ array(
+ $sum_raw_function,
+ ));
+
+ $chains[] = id(new PhabricatorChartFunctionChain())
+ ->addFunction($sum_function);
+
+ foreach ($chains as $chain) {
+ foreach ($chain->getFunctions() as $function) {
+ foreach ($function->selectAllFunctions() as $subfunction) {
+ $subfunction->loadData();
+ }
+ }
+ }
+
+ list($domain_min, $domain_max) = $this->getDomain($chains);
$axis = id(new PhabricatorChartAxis())
->setMinimumValue($domain_min)
@@ -62,12 +114,8 @@
->setLimit(2000);
$datasets = array();
- foreach ($functions as $function) {
- $function->setXAxis($axis);
-
- $function->loadData();
-
- $points = $function->getDatapoints($data_query);
+ foreach ($chains as $chain) {
+ $points = $chain->getDatapoints($data_query);
$x = array();
$y = array();
@@ -154,23 +202,21 @@
}
- private function getDomain(array $functions) {
+ private function getDomain(array $chains) {
$domain_min_list = null;
$domain_max_list = null;
- foreach ($functions as $function) {
- if ($function->hasDomain()) {
- $domain = $function->getDomain();
- $domain_min = $domain[0];
- $domain_max = $domain[1];
+ foreach ($chains as $chain) {
+ $domain = $chain->getDomain();
- if ($domain_min !== null) {
- $domain_min_list[] = $domain_min;
- }
+ list($chain_min, $chain_max) = $domain;
- if ($domain_max !== null) {
- $domain_max_list[] = $domain_max;
- }
+ if ($chain_min !== null) {
+ $domain_min_list[] = $chain_min;
+ }
+
+ if ($chain_max !== null) {
+ $domain_max_list[] = $chain_max;
}
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 28, 7:58 AM (1 w, 1 d ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/lf/vo/ragzbvdurgs5cddb
Default Alt Text
D20454.id48805.diff (33 KB)

Event Timeline

Phabricator · Built by Phacility