stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added several improvements to the interpreters

Browse source
This commit is contained in:
Steffen Vogel 2010-12-26 01:44:06 +01:00
parent edcf529d3d
commit f019a16a5d
3 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
backend/lib/Interpreter/AggregatorInterpreter.php
View file

@ -25,6 +25,7 @@ namespace Volkszaehler\Interpreter;
use Doctrine\ORM;
use Volkszaehler\Model;
use Volkszaehler\Util;
/**
* Interpreter too aggregate several other Channels or Aggregators
@ -34,7 +35,6 @@ use Volkszaehler\Model;
*
* @author Steffen Vogel <info@steffenvogel.de>
* @package default
*
*/
class AggregatorInterpreter implements InterpreterInterface {
/**
@ -57,15 +57,17 @@ class AggregatorInterpreter implements InterpreterInterface {
$indicator = NULL;
$this->aggregator = $aggregator;
foreach ($aggregator->getChannels() as $channel) {
if (isset($indicator) && $indicator != $channel->getType()) {
throw new \Exception('Can\'t aggregate entities of mixed types!');
}
else {
$indicator = $channel->getType();
}
foreach ($aggregator->getChildren() as $child) {
if ($child instanceof Model\Channel) {
if (isset($indicator) && $indicator != $child->getType()) {
throw new \Exception('Can\'t aggregate channels of mixed types!');
}
else {
$indicator = $child->getType();
}
$this->channelInterpreter[] = $channel->getInterpreter($em, $from, $to);
$this->channelInterpreter[] = $child->getInterpreter($em, $from, $to);
}
}
}
@ -76,11 +78,13 @@ class AggregatorInterpreter implements InterpreterInterface {
* @todo to be implemented
* @return array of values
*/
public function getValues($groupBy = NULL) {
public function getValues($tuples = NULL, $groupBy = NULL) {
}
/**
* Get total consumption of all channels
*
* @todo to be implemented
*/
public function getConsumption() {
@ -93,9 +97,9 @@ class AggregatorInterpreter implements InterpreterInterface {
* @return array with the smallest value
*/
public function getMin() {
$min = current($this->channelInterpreter)->getMax();
foreach ($this->channelInterpreter as $channel) {
$arr = $channel->getMax();
$min = current($this->channelInterpreter)->getMin();
foreach ($this->channelInterpreter as $interpreter) {
$arr = $interpreter->getMax();
if ($arr['value '] < $min['value']) {
$min = $arr;
}
@ -110,8 +114,8 @@ class AggregatorInterpreter implements InterpreterInterface {
*/
public function getMax() {
$max = current($this->channelInterpreter)->getMax();
foreach ($this->channelInterpreter as $channel) {
$arr = $channel->getMax();
foreach ($this->channelInterpreter as $interpreter) {
$arr = $interpreter->getMax();
if ($arr['value '] > $max['value']) {
$max = $arr;
}
@ -127,8 +131,8 @@ class AggregatorInterpreter implements InterpreterInterface {
public function getAverage() {
$sum = 0;
foreach ($this->channels as $channel) {
$sum += $channel->getAverage();
foreach ($this->channelInterpreter as $interpreter) {
$sum += $interpreter->getAverage();
}
return ($sum / count($this->channelInterpreter));
}
@ -136,5 +140,6 @@ class AggregatorInterpreter implements InterpreterInterface {
/*
* Getter & setter
*/
public function getUuid() { return $this->aggregator->getUuid(); }
}
public function getEntity() { return $this->aggregator; }
}

3
backend/lib/Interpreter/Interpreter.php
View file

@ -196,7 +196,8 @@ abstract class Interpreter implements InterpreterInterface {
/*
* Getter & setter
*/
public function getUuid() { return $this->channel->getUuid(); }
public function getEntity() { return $this->channel; }
}
?>

5
backend/lib/Interpreter/InterpreterInterface.php
View file

@ -30,8 +30,9 @@ namespace Volkszaehler\Interpreter;
*/
interface InterpreterInterface {
function getConsumption();
function getValues();
function getValues($tuples = NULL, $groupBy = NULL);
function getMin();
function getMax();
function getAverage();
}
function getEntity();
}