nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

rest during intervals counts against averages

Browse Source 
This seems like the right call to me.  If I'm doing an interval and I stop
riding for some reason, I'm resting, and that should affect my average power.
I thought it was always this way, but apparently not.
This commit is contained in:
Sean Rhea
2009-11-21 14:34:45 -05:00
parent 182843896d
commit 51aafe7ede
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/RideItem.cpp
View File

@@ -60,9 +60,8 @@ static void summarize(bool even,
double &int_kph_sum,
double &int_secs_hr,
double &int_max_power,
double int_dur)
double dur)
{
double dur = int_dur;
double mile_len = (km_end - km_start) * MILES_PER_KM;
double minutes = (int) (dur/60.0);
double seconds = dur - (60 * minutes);
@@ -301,15 +300,12 @@ RideItem::htmlSummary()
double int_kph_sum = 0.0;
double int_secs_hr = 0.0;
double int_max_power = 0.0;
double km_end = 0.0, int_dur = 0.0;
double km_end = 0.0;
while (i < ride->dataPoints().size()) {
const RideFilePoint *point = ride->dataPoints()[i++];
if (point->secs >= interval.stop)
break;
if ((point->kph > 0.0) || (point->cad > 0.0)) {
int_dur += secs_delta;
}
if (point->watts >= 0.0) {
secs_watts += secs_delta;
int_watts_sum += point->watts * secs_delta;
@@ -332,7 +328,8 @@ RideItem::htmlSummary()
summarize(even, intervals, interval.name,
firstPoint->km, km_end, int_watts_sum,
int_hr_sum, int_hrs, int_cad_sum, int_kph_sum,
int_secs_hr, int_max_power, int_dur);
int_secs_hr, int_max_power,
interval.stop - interval.start);
even = !even;
}