Measurement framework tests all pass now.

This commit is contained in:
Seth Hall 2013-04-01 14:16:37 -04:00
parent 6dc204b385
commit 53f9948b02
22 changed files with 544 additions and 381 deletions

View file

@ -9,28 +9,31 @@ export {
STD_DEV
};
redef record Result += {
redef record ResultVal += {
## For numeric data, this calculates the standard deviation.
std_dev: double &log &optional;
std_dev: double &optional;
};
}
function calc_std_dev(rv: ResultVal)
{
if ( rv?$variance )
rv$std_dev = sqrt(rv$variance);
}
# This depends on the variance plugin which uses priority -5
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) &priority=-10
{
if ( STD_DEV in r$apply )
{
if ( result?$variance )
result$std_dev = sqrt(result$variance);
if ( rv?$variance )
calc_std_dev(rv);
else
rv$std_dev = 0.0;
}
}
hook compose_resultvals_hook(result: Result, rv1: Result, rv2: Result) &priority=-10
hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal) &priority=-10
{
if ( rv1?$sum || rv2?$sum )
{
result$sum = rv1?$sum ? rv1$sum : 0;
if ( rv2?$sum )
result$sum += rv2$sum;
}
}
calc_std_dev(result);
}