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

Fix RideFileCache refresh bugs

Browse Source 
.. didn't update mean max array

.. always ignored very first data point (!) which was usually
   unnoticed since first point usually lots of zeroes.
This commit is contained in:
Mark Liversedge
2014-12-29 15:54:52 +00:00
parent 5692d362d0
commit c40630c1ca
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/RideFileCache.cpp
View File

@@ -423,35 +423,6 @@ RideFileCache::RideFileCache(RideFile *ride) :
// calculate all the arrays
compute();
// setup the doubles the users use
doubleArray(wattsMeanMaxDouble, wattsMeanMax, RideFile::watts);
doubleArray(hrMeanMaxDouble, hrMeanMax, RideFile::hr);
doubleArray(cadMeanMaxDouble, cadMeanMax, RideFile::cad);
doubleArray(nmMeanMaxDouble, nmMeanMax, RideFile::nm);
doubleArray(kphMeanMaxDouble, kphMeanMax, RideFile::kph);
doubleArray(kphdMeanMaxDouble, kphdMeanMax, RideFile::kphd);
doubleArray(wattsdMeanMaxDouble, wattsdMeanMax, RideFile::wattsd);
doubleArray(caddMeanMaxDouble, caddMeanMax, RideFile::cadd);
doubleArray(nmdMeanMaxDouble, nmdMeanMax, RideFile::nmd);
doubleArray(hrdMeanMaxDouble, hrdMeanMax, RideFile::hrd);
doubleArray(npMeanMaxDouble, npMeanMax, RideFile::NP);
doubleArray(vamMeanMaxDouble, vamMeanMax, RideFile::vam);
doubleArray(xPowerMeanMaxDouble, xPowerMeanMax, RideFile::xPower);
doubleArray(wattsKgMeanMaxDouble, wattsKgMeanMax, RideFile::wattsKg);
doubleArray(aPowerMeanMaxDouble, aPowerMeanMax, RideFile::aPower);
doubleArrayForDistribution(wattsDistributionDouble, wattsDistribution);
doubleArrayForDistribution(hrDistributionDouble, hrDistribution);
doubleArrayForDistribution(cadDistributionDouble, cadDistribution);
doubleArrayForDistribution(gearDistributionDouble, gearDistribution);
doubleArrayForDistribution(nmDistributionDouble, nmDistribution);
doubleArrayForDistribution(kphDistributionDouble, kphDistribution);
doubleArrayForDistribution(xPowerDistributionDouble, xPowerDistribution);
doubleArrayForDistribution(npDistributionDouble, npDistribution);
doubleArrayForDistribution(wattsKgDistributionDouble, wattsKgDistribution);
doubleArrayForDistribution(aPowerDistributionDouble, aPowerDistribution);
doubleArrayForDistribution(smo2DistributionDouble, smo2Distribution);
}
int
@@ -818,6 +789,35 @@ void RideFileCache::RideFileCache::compute()
thread13.wait();
thread14.wait();
thread15.wait();
// setup the doubles the users use
doubleArray(wattsMeanMaxDouble, wattsMeanMax, RideFile::watts);
doubleArray(hrMeanMaxDouble, hrMeanMax, RideFile::hr);
doubleArray(cadMeanMaxDouble, cadMeanMax, RideFile::cad);
doubleArray(nmMeanMaxDouble, nmMeanMax, RideFile::nm);
doubleArray(kphMeanMaxDouble, kphMeanMax, RideFile::kph);
doubleArray(kphdMeanMaxDouble, kphdMeanMax, RideFile::kphd);
doubleArray(wattsdMeanMaxDouble, wattsdMeanMax, RideFile::wattsd);
doubleArray(caddMeanMaxDouble, caddMeanMax, RideFile::cadd);
doubleArray(nmdMeanMaxDouble, nmdMeanMax, RideFile::nmd);
doubleArray(hrdMeanMaxDouble, hrdMeanMax, RideFile::hrd);
doubleArray(npMeanMaxDouble, npMeanMax, RideFile::NP);
doubleArray(vamMeanMaxDouble, vamMeanMax, RideFile::vam);
doubleArray(xPowerMeanMaxDouble, xPowerMeanMax, RideFile::xPower);
doubleArray(wattsKgMeanMaxDouble, wattsKgMeanMax, RideFile::wattsKg);
doubleArray(aPowerMeanMaxDouble, aPowerMeanMax, RideFile::aPower);
doubleArrayForDistribution(wattsDistributionDouble, wattsDistribution);
doubleArrayForDistribution(hrDistributionDouble, hrDistribution);
doubleArrayForDistribution(cadDistributionDouble, cadDistribution);
doubleArrayForDistribution(gearDistributionDouble, gearDistribution);
doubleArrayForDistribution(nmDistributionDouble, nmDistribution);
doubleArrayForDistribution(kphDistributionDouble, kphDistribution);
doubleArrayForDistribution(xPowerDistributionDouble, xPowerDistribution);
doubleArrayForDistribution(npDistributionDouble, npDistribution);
doubleArrayForDistribution(wattsKgDistributionDouble, wattsKgDistribution);
doubleArrayForDistribution(aPowerDistributionDouble, aPowerDistribution);
doubleArrayForDistribution(smo2DistributionDouble, smo2Distribution);
}
//----------------------------------------------------------------------
@@ -1091,8 +1091,8 @@ MeanMaxComputer::run()
first = false;
}
// drag back to start at 0s
double psecs = p->secs - offset;
// drag back to start at 1s or whatever recIntSecs() is !
double psecs = p->secs - offset + ride->recIntSecs();
// fill in any gaps in recording - use same dodgy rounding as before
int count = (psecs - lastsecs - ride->recIntSecs()) / ride->recIntSecs();