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

Merge pull request #1279 from amtriathlon/master

Browse Source 
Fixed GOVSS & SwimScore for manual workouts
This commit is contained in:
Mark Liversedge
2015-01-24 11:59:44 +00:00
parent 1afcc52cbe bbc978b77a
commit a888f6a77b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/GOVSS.cpp
View File

@@ -352,7 +352,8 @@ class GOVSS : public RideMetric {
assert(deps.contains("time_riding"));
double watts = running_power(weight, height, deps.value("average_speed")->value(true) / 3.6);
double secs = deps.value("time_riding")->value(true);
rawGOVSS = watts * secs;
double iwf = rtp->value(true) ? watts / rtp->value(true) : 0.0;
rawGOVSS = watts * secs * iwf;
}
double workInAnHourAtRTP = rtp->value(true) * 3600;
score = workInAnHourAtRTP ? rawGOVSS / workInAnHourAtRTP * 100.0 : 0;

3
src/SwimScore.cpp
View File

@@ -298,7 +298,8 @@ class SwimScore : public RideMetric {
assert(deps.contains("time_riding"));
double watts = swimming_power(weight, deps.value("average_speed")->value(true) / 3.6);
double secs = deps.value("time_riding")->value(true);
rawGOVSS = watts * secs;
double sri = stp->value(true) ? watts / stp->value(true) : 0.0;
rawGOVSS = watts * secs * sri;
}
double workInAnHourAtSTP = stp->value(true) * 3600;
score = workInAnHourAtSTP ? rawGOVSS / workInAnHourAtSTP * 100.0 : 0;