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 #1303 from amtriathlon/master

Browse Source 
Use Duration when Time Moving is zero in Session RPE and Daniels EqP
This commit is contained in:
Mark Liversedge
2015-02-05 13:43:31 +00:00
parent b6b2472419 36991ae45e
commit 46c02ea4e6
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/DanielsPoints.cpp
View File

@@ -132,12 +132,16 @@ class DanielsEquivalentPower : public RideMetric {
double cp = zones->getCP(zoneRange);
assert(deps.contains("daniels_points"));
assert(deps.contains("time_riding"));
assert(deps.contains("workout_time"));
const RideMetric *danielsPoints = deps.value("daniels_points");
const RideMetric *timeRiding = deps.value("time_riding");
const RideMetric *workoutTime = deps.value("workout_time");
assert(danielsPoints);
assert(timeRiding);
assert(workoutTime);
double score = danielsPoints->value(true);
double secs = timeRiding->value(true);
double secs = timeRiding->value(true) ? timeRiding->value(true) :
workoutTime->value(true);
watts = secs == 0.0 ? 0.0 : cp * pow(score / DanielsPoints::K / secs, 0.25);
setValue(watts);
@@ -149,6 +153,7 @@ static bool added() {
RideMetricFactory::instance().addMetric(DanielsPoints());
QVector<QString> deps;
deps.append("time_riding");
deps.append("workout_time");
deps.append("daniels_points");
RideMetricFactory::instance().addMetric(DanielsEquivalentPower(), &deps);
return true;

7
src/TRIMPPoints.cpp
View File

@@ -335,8 +335,12 @@ class SessionRPE : public RideMetric {
assert(deps.contains("time_riding"));
const RideMetric *timeRidingMetric = deps.value("time_riding");
assert(timeRidingMetric);
assert(deps.contains("workout_time"));
const RideMetric *durationMetric = deps.value("workout_time");
assert(durationMetric);
double secs = timeRidingMetric->value(true);
double secs = timeRidingMetric->value(true) ? timeRidingMetric->value(true) :
durationMetric->value(true);;
// ok lets work the score out
score = ((secs == 0.0 || rpe == 0) ? 0.0 : secs/60 *rpe);
@@ -371,6 +375,7 @@ static bool added() {
deps.clear();
deps.append("time_riding");
deps.append("workout_time");
RideMetricFactory::instance().addMetric(SessionRPE(), &deps);
return true;
}