mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 08:38:20 +00:00
Measurement framework tests all pass now.
This commit is contained in:
parent
6dc204b385
commit
53f9948b02
22 changed files with 544 additions and 381 deletions
|
@ -7,24 +7,24 @@ export {
|
|||
AVERAGE
|
||||
};
|
||||
|
||||
redef record Result += {
|
||||
redef record ResultVal += {
|
||||
## For numeric data, this calculates the average of all values.
|
||||
average: double &log &optional;
|
||||
average: double &optional;
|
||||
};
|
||||
}
|
||||
|
||||
hook add_to_reducer(r: Reducer, val: double, data: DataPoint, result: Result)
|
||||
hook add_to_reducer_hook(r: Reducer, val: double, data: DataPoint, rv: ResultVal)
|
||||
{
|
||||
if ( AVERAGE in r$apply )
|
||||
{
|
||||
if ( ! result?$average )
|
||||
result$average = val;
|
||||
if ( ! rv?$average )
|
||||
rv$average = val;
|
||||
else
|
||||
result$average += (val - result$average) / result$num;
|
||||
rv$average += (val - rv$average) / rv$num;
|
||||
}
|
||||
}
|
||||
|
||||
hook compose_resultvals_hook(result: Result, rv1: Result, rv2: Result)
|
||||
hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal)
|
||||
{
|
||||
if ( rv1?$average && rv2?$average )
|
||||
result$average = ((rv1$average*rv1$num) + (rv2$average*rv2$num))/(rv1$num+rv2$num);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue