From bbc978b77affce354bd1af191527272bd03196af Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Sat, 24 Jan 2015 08:49:14 -0300 Subject: [PATCH] Fixed GOVSS & SwimScore for manual workouts Forgot to include relative intensity --- src/GOVSS.cpp | 3 ++- src/SwimScore.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GOVSS.cpp b/src/GOVSS.cpp index b1eb2d524..e69ebe89c 100644 --- a/src/GOVSS.cpp +++ b/src/GOVSS.cpp @@ -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; diff --git a/src/SwimScore.cpp b/src/SwimScore.cpp index d4c88b4ae..7aed96179 100644 --- a/src/SwimScore.cpp +++ b/src/SwimScore.cpp @@ -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;