From 36991ae45eaa8b3801b120535b19fe8010bae541 Mon Sep 17 00:00:00 2001
From: Alejandro Martinez <amtriathlon@gmail.com>
Date: Thu, 5 Feb 2015 10:35:53 -0300
Subject: [PATCH] Use Duration when Time Moving is zero in Session RPE and
 Daniels EqP

Similar to TRIMP points, Fixes #1265
---
 src/DanielsPoints.cpp | 7 ++++++-
 src/TRIMPPoints.cpp   | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/DanielsPoints.cpp b/src/DanielsPoints.cpp
index 1b889ace1..03ed01662 100644
--- a/src/DanielsPoints.cpp
+++ b/src/DanielsPoints.cpp
@@ -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;
diff --git a/src/TRIMPPoints.cpp b/src/TRIMPPoints.cpp
index 976446d53..5193d397c 100644
--- a/src/TRIMPPoints.cpp
+++ b/src/TRIMPPoints.cpp
@@ -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;
 }