nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-14 08:38:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Metric Aggregation ::aggregateZero() method

Browse Source 
.. when aggregating metrics across rides we were being inconsistent
   with regards how we handled zero values; we sometimes included them
   and sometimes didn't.

.. now added a metric method bool aggregateZero() that returns true
   if aggregates need to include zero values

.. this has been implemented where averages are aggregated.
This commit is contained in:
Mark Liversedge
2014-06-20 11:19:55 +01:00
parent 5a9cd0f7bd
commit cf445e87bd
4 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/LTMPlot.cpp
View File

@@ -2259,6 +2259,7 @@ LTMPlot::createTODCurveData(Context *context, LTMSettings *settings, MetricDetai
int array = rideMetrics.getRideDate().time().hour();
int type = metricDetail.metric ? metricDetail.metric->type() : RideMetric::Average;
bool aggZero = metricDetail.metric ? metricDetail.metric->aggregateZero() : false;
if (metricDetail.uunits == "Ramp" ||
metricDetail.uunits == tr("Ramp")) type = RideMetric::Total;
@@ -2272,7 +2273,8 @@ LTMPlot::createTODCurveData(Context *context, LTMSettings *settings, MetricDetai
// average should be calculated taking into account
// the duration of the ride, otherwise high value but
// short rides will skew the overall average
y[array] = value; //XXX average is broken
if (value || aggZero)
y[array] = value; //XXX average is broken
break;
}
case RideMetric::Low:
@@ -2297,6 +2299,9 @@ LTMPlot::createCurveData(Context *context, LTMSettings *settings, MetricDetail m
x.resize(maxdays+3); // one for start from zero plus two for 0 value added at head and tail
y.resize(maxdays+3); // one for start from zero plus two for 0 value added at head and tail
// do we aggregate ?
bool aggZero = metricDetail.metric ? metricDetail.metric->aggregateZero() : false;
// Get metric data, either from metricDB for RideFile metrics
// or from StressCalculator for PM type metrics
QList<SummaryMetrics> PMCdata;
@@ -2371,7 +2376,10 @@ LTMPlot::createCurveData(Context *context, LTMSettings *settings, MetricDetail m
y[n] = value;
x[n] = currentDay - groupForDate(settings->start.date(), settings->groupBy);
secondsPerGroupBy = seconds; // reset for new group
// only increment counter if nonzero or we aggregate zeroes
if (value || aggZero) secondsPerGroupBy = seconds;
} else {
// sum totals, average averages and choose best for Peaks
int type = metricDetail.metric ? metricDetail.metric->type() : RideMetric::Average;
@@ -2393,7 +2401,7 @@ LTMPlot::createCurveData(Context *context, LTMSettings *settings, MetricDetail m
// average should be calculated taking into account
// the duration of the ride, otherwise high value but
// short rides will skew the overall average
y[n] = ((y[n]*secondsPerGroupBy)+(seconds*value)) / (secondsPerGroupBy+seconds);
if (value || aggZero) y[n] = ((y[n]*secondsPerGroupBy)+(seconds*value)) / (secondsPerGroupBy+seconds);
break;
}
case RideMetric::Low: