SumStats test checkpoint.

This commit is contained in:
Seth Hall 2013-04-16 00:54:41 -04:00
parent 437815454d
commit 1cac89e4f8
16 changed files with 55 additions and 116 deletions

View file

@ -14,7 +14,7 @@ export {
};
}
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal)
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( AVERAGE in r$apply )
{

View file

@ -14,7 +14,7 @@ export {
};
}
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal)
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( MAX in r$apply )
{

View file

@ -14,7 +14,7 @@ export {
};
}
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal)
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( MIN in r$apply )
{

View file

@ -29,13 +29,13 @@ function get_samples(rv: ResultVal): vector of Observation
return s;
}
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal)
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( r$samples > 0 )
{
if ( ! rv?$samples )
rv$samples = Queue::init([$max_len=r$samples]);
Queue::put(rv$samples, data);
Queue::put(rv$samples, obs);
}
}

View file

@ -22,13 +22,10 @@ function calc_std_dev(rv: ResultVal)
}
# This depends on the variance plugin which uses priority -5
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal) &priority=-10
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) &priority=-10
{
if ( STD_DEV in r$apply )
{
if ( rv?$variance )
calc_std_dev(rv);
}
calc_std_dev(rv);
}
hook compose_resultvals_hook(result: ResultVal, rv1: ResultVal, rv2: ResultVal) &priority=-10

View file

@ -34,7 +34,7 @@ hook init_resultval_hook(r: Reducer, rv: ResultVal)
rv$sum = 0;
}
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal)
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( SUM in r$apply )
rv$sum += val;

View file

@ -23,13 +23,13 @@ redef record ResultVal += {
unique_vals: set[Observation] &optional;
};
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal)
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal)
{
if ( UNIQUE in r$apply )
{
if ( ! rv?$unique_vals )
rv$unique_vals=set();
add rv$unique_vals[data];
add rv$unique_vals[obs];
rv$unique = |rv$unique_vals|;
}
}

View file

@ -29,7 +29,7 @@ function calc_variance(rv: ResultVal)
}
# Reduced priority since this depends on the average
hook add_to_reducer_hook(r: Reducer, val: double, data: Observation, rv: ResultVal) &priority=-5
hook add_to_reducer_hook(r: Reducer, val: double, obs: Observation, rv: ResultVal) &priority=-5
{
if ( VARIANCE in r$apply )
{