nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 00:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

MetricAggregator Model Refresh (Part 1 of 3)

Browse Source 
.. added the code to aggregate power data when deriving
   model parameter history over time.

.. need to get a class that applies the various models to
   generate the parameters we need (so we can reuse) in
   part 2.

.. then need to store and turn into a metric of some kind
   in part 3.

.. this is largely a checkpoint commit to enable cross platform
   testing with Mac and Windows.
This commit is contained in:
Mark Liversedge
2014-05-09 19:48:25 +01:00
parent e834a92630
commit e9ecc02bff
4 changed files with 158 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/RideFileCache.cpp
View File

@@ -129,6 +129,16 @@ RideFileCache::RideFileCache(Context *context, QString fileName, RideFile *passe
}
}
// get the date from the ride file name
static QDate dateFromFileName(const QString filename) {
QRegExp rx("^(\\d\\d\\d\\d)_(\\d\\d)_(\\d\\d)_\\d\\d_\\d\\d_\\d\\d\\..*$");
if (rx.exactMatch(filename)) {
QDate date(rx.cap(1).toInt(), rx.cap(2).toInt(), rx.cap(3).toInt());
if (date.isValid()) return date;
}
return QDate(); // nil date
}
// returns offset from end of head
static long offsetForMeanMax(RideFileCacheHeader head, RideFile::SeriesType series)
{
@@ -223,6 +233,41 @@ static long countForMeanMax(RideFileCacheHeader head, RideFile::SeriesType serie
return 0;
}
QVector<float> RideFileCache::meanMaxPowerFor(Context *context, QDate from, QDate to)
{
QVector<float> returning;
bool first = true;
// look at all the rides
foreach (QString rideFileName, RideFileFactory::instance().listRideFiles(context->athlete->home)) {
QDate rideDate = dateFromFileName(rideFileName);
if (rideDate < from || rideDate > to) continue; // not one we want
// get the power data
if (first == true) {
// first time through the whole thing is going to be best
returning = meanMaxPowerFor(context, context->athlete->home.absolutePath() + "/" + rideFileName);
first = false;
} else {
// next time through we should only pick out better times
QVector<float> ridebest = meanMaxPowerFor(context, context->athlete->home.absolutePath() + "/" + rideFileName);
// do we need to increase the returning array?
if (returning.size() < ridebest.size()) returning.resize(ridebest.size());
// now update where its a better number
for (int i=0; i<ridebest.size(); i++)
if (ridebest[i] > returning[i]) returning[i] = ridebest[i];
}
}
return returning;
}
QVector<float> RideFileCache::meanMaxPowerFor(Context *, QString fileName)
{
QTime start;
@@ -1208,14 +1253,6 @@ RideFileCache::computeDistribution(QVector<float> &array, RideFile::SeriesType s
//
// AGGREGATE FOR A GIVEN DATE RANGE
//
static QDate dateFromFileName(const QString filename) {
QRegExp rx("^(\\d\\d\\d\\d)_(\\d\\d)_(\\d\\d)_\\d\\d_\\d\\d_\\d\\d\\..*$");
if (rx.exactMatch(filename)) {
QDate date(rx.cap(1).toInt(), rx.cap(2).toInt(), rx.cap(3).toInt());
if (date.isValid()) return date;
}
return QDate(); // nil date
}
// select and update bests
static void meanMaxAggregate(QVector<double> &into, QVector<double> &other, QVector<QDate>&dates, QDate rideDate)