From 3096fb42a11ecb01c3cded6fe5d2ec1aabdc1157 Mon Sep 17 00:00:00 2001
From: Alejandro Martinez <amtriathlon@gmail.com>
Date: Tue, 26 Oct 2021 19:55:03 -0300
Subject: [PATCH] Fix expression precedence in Bike and Power estimators

Likely not too relevant, but it was an error.
Fixes #4049
---
 src/FileIO/FixDerivePower.cpp  | 4 ++--
 src/FileIO/FixRunningPower.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/FileIO/FixDerivePower.cpp b/src/FileIO/FixDerivePower.cpp
index 7e58ccb35..f29b2fa53 100644
--- a/src/FileIO/FixDerivePower.cpp
+++ b/src/FileIO/FixDerivePower.cpp
@@ -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))";
diff --git a/src/FileIO/FixRunningPower.cpp b/src/FileIO/FixRunningPower.cpp
index ab4f95851..68f6f2a8a 100644
--- a/src/FileIO/FixRunningPower.cpp
+++ b/src/FileIO/FixRunningPower.cpp
@@ -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;