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

Modify TRIMP formula to use time_riding instead of workout time

Browse Source 
Fixes #355.
This commit is contained in:
Damien
2011-08-05 23:45:04 +02:00
committed by Mark Liversedge
parent c045e40749
commit 083569af5c
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DBAccess.cpp
View File

@@ -40,7 +40,7 @@
// DB Schema Version - YOU MUST UPDATE THIS IF THE SCHEMA VERSION CHANGES!!!
// Schema version will change if a) the default metadata.xml is updated
// or b) new metrics are added / old changed
static int DBSchemaVersion = 25;
static int DBSchemaVersion = 26;
DBAccess::DBAccess(MainWindow* main, QDir home) : main(main), home(home)
{

22
src/TRIMPPoints.cpp
View File

@@ -67,14 +67,15 @@ class TRIMPPoints : public RideMetric {
double restHr = hrZones->getRestHr(hrZoneRange);
restHr = rideFile->getTag("Rest HR", QString("%1").arg(restHr)).toDouble();
assert(deps.contains("workout_time"));
assert(deps.contains("time_riding"));
assert(deps.contains("average_hr"));
const RideMetric *workoutTimeMetric = deps.value("workout_time");
//const RideMetric *workoutTimeMetric = deps.value("workout_time");
const RideMetric *timeRidingMetric = deps.value("time_riding");
const RideMetric *averageHrMetric = deps.value("average_hr");
assert(workoutTimeMetric);
assert(timeRidingMetric);
assert(averageHrMetric);
double secs = workoutTimeMetric->value(true);
double secs = timeRidingMetric->value(true);
double hr = averageHrMetric->value(true);
//TRIMP: = t x %HRR x 0.64e1,92(%HRR)
@@ -312,11 +313,11 @@ class SessionRPE : public RideMetric {
// use RPE value in ride metadata
double rpe = rideFile->getTag("RPE", "0.0").toDouble();
assert(deps.contains("workout_time"));
const RideMetric *workoutTimeMetric = deps.value("workout_time");
assert(workoutTimeMetric);
assert(deps.contains("time_riding"));
const RideMetric *timeRidingMetric = deps.value("time_riding");
assert(timeRidingMetric);
double secs = workoutTimeMetric->value(true);
double secs = timeRidingMetric->value(true);
// ok lets work the score out
score = ((secs == 0.0 || rpe == 0) ? 0.0 : secs/60 *rpe);
@@ -328,12 +329,11 @@ class SessionRPE : public RideMetric {
static bool added() {
QVector<QString> deps;
deps.append("workout_time");
deps.append("time_riding");
deps.append("average_hr");
RideMetricFactory::instance().addMetric(TRIMPPoints(), &deps);
deps.clear();
deps.append("workout_time");
deps.append("trimp_points");
RideMetricFactory::instance().addMetric(TRIMP100Points(), &deps);
@@ -347,7 +347,7 @@ static bool added() {
RideMetricFactory::instance().addMetric(TRIMPZonalPoints(), &deps);
deps.clear();
deps.append("workout_time");
deps.append("time_riding");
RideMetricFactory::instance().addMetric(SessionRPE(), &deps);
return true;
}