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

Fix expression precedence in Bike and Power estimators

Browse Source 
Likely not too relevant, but it was an error.
Fixes #4049
This commit is contained in:
Alejandro Martinez
2021-10-26 19:55:03 -03:00
parent 1ead8e0922
commit 3096fb42a1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/FileIO/FixDerivePower.cpp
View File

@@ -313,8 +313,8 @@ FixDerivePower::postProcess(RideFile *ride, DataProcessorConfig *config=0, QStri
CdA = CwaRider + CwaBike;
}
Ka = 176.5 * exp(-p->alt * .0001253) * CdA * DraftM / (273 + T);
//qDebug()<<"acc="<<p->kphd<<" , V="<<V<<" , m="<<M<<" , Pa="<<(p->kphd > 1 ? 1 : p->kphd*V*M);
double watts = (afCm * V * (Ka * (vw * vw) + Frg + V * CrDyn))+(p->kphd > 1 ? 1 : p->kphd*V*M);
//qDebug()<<"acc="<<p->kphd<<" , V="<<V<<" , m="<<M<<" , Pa="<<(p->kphd > 1 ? 1 : p->kphd)*V*M;
double watts = (afCm * V * (Ka * (vw * vw) + Frg + V * CrDyn)) + (p->kphd > 1 ? 1 : p->kphd)*V*M;
ride->command->setPointValue(i, RideFile::watts, watts > 0 ? (watts > 1000 ? 1000 : watts) : 0);
// qDebug() << "watts = "<<p->watts;
// qDebug() << " " << afCm * V * Ka * (vw * vw) << " = afCm(=" << afCm << ") * V(=" << V << ") * Ka(="<<Ka<<") * (vw^2(=" << V+W << "^2))";

2
src/FileIO/FixRunningPower.cpp
View File

@@ -254,7 +254,7 @@ FixRunningPower::postProcess(RideFile *ride, DataProcessorConfig *config=0, QStr
double forw = Cr * Mtotal * eff * V;
double aero = 0.5 * rho * Cx * FA * DraftM * (vw*vw) * V;
double grav = 9.81 * Mtotal * sin(Slope) * V;
double chgV = p->kphd > 1 ? 1 : p->kphd * Mtotal * V;
double chgV = (p->kphd > 1 ? 1 : p->kphd) * Mtotal * V;
// Power = moving forward + aerodynamic + gravity + change of speed
double watts = forw + aero + grav + chgV;