From 89a5ca26348c270d92e034d330e46a9ee8e97f82 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Mon, 20 Jan 2014 20:33:33 +0000
Subject: [PATCH] Added W' expenditure metric

.. energy spent above CP
---
 src/DBAccess.cpp |  3 ++-
 src/WPrime.cpp   | 37 +++++++++++++++++++++++++++++++++++--
 src/WPrime.h     |  2 +-
 3 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/DBAccess.cpp b/src/DBAccess.cpp
index 5f86c0909..6dbb0d236 100644
--- a/src/DBAccess.cpp
+++ b/src/DBAccess.cpp
@@ -75,8 +75,9 @@
 // 54  07  Jan 2014 Mark Liversedge    Revised Estimated VO2MAX metric formula
 // 55  20  Jan 2014 Mark Liversedge    Added back Minimum W'bal metric and MaxMatch
 // 56  20  Jan 2014 Mark Liversedge    Added W' TAU to be able to track it
+// 57  20  Jan 2014 Mark Liversedge    Added W' Expenditure for total energy spent above CP
 
-int DBSchemaVersion = 55;
+int DBSchemaVersion = 57;
 
 DBAccess::DBAccess(Context* context) : context(context), db(NULL)
 {
diff --git a/src/WPrime.cpp b/src/WPrime.cpp
index 7eef12eff..367d1db99 100644
--- a/src/WPrime.cpp
+++ b/src/WPrime.cpp
@@ -125,6 +125,7 @@ WPrime::setRide(RideFile *input)
     double totalBelowCP=0;
     double countBelowCP=0;
     QVector<int> inputArray(last+1);
+    EXP = 0;
     for (int i=0; i<last; i++) {
 
         int value = smoothed.value(i);
@@ -133,7 +134,7 @@ WPrime::setRide(RideFile *input)
         if (value < CP) {
             totalBelowCP += value;
             countBelowCP++;
-        }
+        } else EXP += value; // total expenditure above CP
     }
 
     TAU = 546.00f * pow(E,-0.01*(CP - (totalBelowCP/countBelowCP))) + 316.00f;
@@ -316,7 +317,7 @@ class MaxMatch : public RideMetric {
     }
     void initialize() {
         setName(tr("Maximum W'bal Match"));
-        setType(RideMetric::Low);
+        setType(RideMetric::Peak);
         setMetricUnits(tr("Kj"));
         setImperialUnits(tr("Kj"));
         setPrecision(1);
@@ -366,11 +367,43 @@ class WPrimeTau : public RideMetric {
     RideMetric *clone() const { return new WPrimeTau(*this); }
 };
 
+class WPrimeExp : public RideMetric {
+    Q_DECLARE_TR_FUNCTIONS(WPrimeExp);
+
+    public:
+
+    WPrimeExp()
+    {
+        setSymbol("skiba_wprime_exp");
+        setInternalName("W' expenditure");
+    }
+    void initialize() {
+        setName(tr("W' expenditure"));
+        setType(RideMetric::Total);
+        setMetricUnits(tr("Kj"));
+        setImperialUnits(tr("Kj"));
+        setPrecision(1);
+    }
+    void compute(const RideFile *r, const Zones *, int,
+                 const HrZones *, int,
+                 const QHash<QString,RideMetric*> &,
+                 const Context *) {
+
+        WPrime w;
+        w.setRide((RideFile*)r);
+        setValue(w.EXP/1000);
+    }
+
+    bool canAggregate() { return false; }
+    RideMetric *clone() const { return new WPrimeExp(*this); }
+};
+
 // add to catalogue
 static bool addMetrics() {
     RideMetricFactory::instance().addMetric(MinWPrime());
     RideMetricFactory::instance().addMetric(MaxMatch());
     RideMetricFactory::instance().addMetric(WPrimeTau());
+    RideMetricFactory::instance().addMetric(WPrimeExp());
     return true;
 }
 
diff --git a/src/WPrime.h b/src/WPrime.h
index baeede074..b99a70e0d 100644
--- a/src/WPrime.h
+++ b/src/WPrime.h
@@ -54,7 +54,7 @@ class WPrime {
 
         double maxMatch();
         double minY, maxY;
-        double TAU, CP, WPRIME;
+        double TAU, CP, WPRIME, EXP;
 
         QList<Match> matches;       // matches burned with associated cost