diff options
| -rw-r--r-- | src/datasets/average.php | 7 | ||||
| -rw-r--r-- | tests/dataset_average_test.php | 15 |
2 files changed, 8 insertions, 14 deletions
diff --git a/src/datasets/average.php b/src/datasets/average.php index 0dc8f94..3842d21 100644 --- a/src/datasets/average.php +++ b/src/datasets/average.php @@ -36,16 +36,17 @@ class ezcGraphDataSetAveragePolynom extends ezcGraphDataSet /** * Constructor * - * @param array $options Default option array + * @param array $dataset Dataset to interpolate + * @param array $order Maximum order of interpolating polynom * @return void * @ignore */ - public function __construct( ezcGraphDataSet $dataset ) + public function __construct( ezcGraphDataSet $dataset, $order = 3 ) { parent::__construct(); $this->properties['resolution'] = 100; - $this->properties['polynomOrder'] = 3; + $this->properties['polynomOrder'] = (int) $order; $this->source = $dataset; } diff --git a/tests/dataset_average_test.php b/tests/dataset_average_test.php index 758d8c5..1d67f8c 100644 --- a/tests/dataset_average_test.php +++ b/tests/dataset_average_test.php @@ -190,17 +190,10 @@ class ezcGraphDataSetAverageTest extends ezcTestCase ) ); $chart->data['Statistical data']->symbol = ezcGraph::BULLET; - $chart->data['polynom order 0'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'] ); - $chart->data['polynom order 0']->polynomOrder = 0; - - $chart->data['polynom order 1'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'] ); - $chart->data['polynom order 1']->polynomOrder = 1; - - $chart->data['polynom order 3'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'] ); - $chart->data['polynom order 3']->polynomOrder = 3; - - $chart->data['polynom order 5'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'] ); - $chart->data['polynom order 5']->polynomOrder = 5; + $chart->data['polynom order 0'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'], 0 ); + $chart->data['polynom order 1'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'], 1 ); + $chart->data['polynom order 3'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'], 3 ); + $chart->data['polynom order 5'] = new ezcGraphDataSetAveragePolynom( $chart->data['Statistical data'], 5 ); $chart->xAxis = new ezcGraphChartElementNumericAxis(); |
