From 42ae20e9d5477d97da3452f1e8f37b73323eeb05 Mon Sep 17 00:00:00 2001
From: Agustin <agusr1999@gmail.com>
Date: Thu, 23 Sep 2021 16:12:32 -0300
Subject: [PATCH] Minor fixes to calculations and hardcoded parameters
---
src/Services/ERCalculator.ts | 4 +--
src/Services/ParameterService.ts | 48 ++++++++++++++++----------------
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/Services/ERCalculator.ts b/src/Services/ERCalculator.ts
index 3a3513a..1c8c941 100644
--- a/src/Services/ERCalculator.ts
+++ b/src/Services/ERCalculator.ts
@@ -23,7 +23,7 @@ const isIndividualMaternity = (obj: IndividualMaternity | PopulationMaternity):
const calculateTEE = (group: AgeGroup, params: number[], preval: MinorPAL): number => {
const teeModerate: number = params[0]
+ (params[1] * group.medianWeight)
- - params[2] * (group.medianWeight * group.medianWeight);
+ + params[2] * (group.medianWeight * group.medianWeight);
const teeLow: number = teeModerate - (teeModerate * params[4]) / 100;
const teeIntense: number = teeModerate + (teeModerate * params[5]) / 100;
@@ -114,7 +114,7 @@ const calculate6To17Years = (group: AgeGroup, params: number[], data: ExtraData)
} else {
tee = calculateTEE(group, params, data.minorPAL);
}
-
+ console.log(tee);
const requirement = tee + params[3];
const groupRequirement: GroupEnergeticRequirement = {
diff --git a/src/Services/ParameterService.ts b/src/Services/ParameterService.ts
index 30f6085..41469c5 100644
--- a/src/Services/ParameterService.ts
+++ b/src/Services/ParameterService.ts
@@ -179,120 +179,120 @@ const getEquationValues = (ageBracket: AgeBracket, sex: Sex): number[] => {
case (AgeBracket.a6): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 11, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 12, 15, 15];
+ res = [310.2, 63.3, -0.263, 12, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 10, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 13, 15, 15];
+ res = [263.4, 65.3, -0.454, 13, -15, 15];
}
break;
}
case (AgeBracket.a7): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 14, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 14, 15, 15];
+ res = [310.2, 63.3, -0.263, 14, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 17, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 17, 15, 15];
+ res = [263.4, 65.3, -0.454, 17, -15, 15];
}
break;
}
case (AgeBracket.a8): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 16, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 16, 15, 15];
+ res = [310.2, 63.3, -0.263, 16, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 20, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 20, 15, 15];
+ res = [263.4, 65.3, -0.454, 20, -15, 15];
}
break;
}
case (AgeBracket.a9): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 19, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 19, 15, 15];
+ res = [310.2, 63.3, -0.263, 19, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 23, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 23, 15, 15];
+ res = [263.4, 65.3, -0.454, 23, -15, 15];
}
break;
}
case (AgeBracket.a10): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 22, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 22, 15, 15];
+ res = [310.2, 63.3, -0.263, 22, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 25, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 25, 15, 15];
+ res = [263.4, 65.3, -0.454, 25, -15, 15];
}
break;
}
case (AgeBracket.a11): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 25, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 25, 15, 15];
+ res = [310.2, 63.3, -0.263, 25, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 25, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 25, 15, 15];
+ res = [263.4, 65.3, -0.454, 25, -15, 15];
}
break;
}
case (AgeBracket.a12): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 29, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 29, 15, 15];
+ res = [310.2, 63.3, -0.263, 29, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 26, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 26, 15, 15];
+ res = [263.4, 65.3, -0.454, 26, -15, 15];
}
break;
}
case (AgeBracket.a13): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 33, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 33, 15, 15];
+ res = [310.2, 63.3, -0.263, 33, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 24, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 24, 15, 15];
+ res = [263.4, 65.3, -0.454, 24, -15, 15];
}
break;
}
case (AgeBracket.a14): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 33, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 33, 15, 15];
+ res = [310.2, 63.3, -0.263, 33, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 19, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 19, 15, 15];
+ res = [263.4, 65.3, -0.454, 19, -15, 15];
}
break;
}
case (AgeBracket.a15): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 31, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 31, 15, 15];
+ res = [310.2, 63.3, -0.263, 31, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 13, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 13, 15, 15];
+ res = [263.4, 65.3, -0.454, 13, -15, 15];
}
break;
}
case (AgeBracket.a16): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 24, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 24, 15, 15];
+ res = [310.2, 63.3, -0.263, 24, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 5, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 5, 15, 15];
+ res = [263.4, 65.3, -0.454, 5, -15, 15];
}
break;
}
case (AgeBracket.a17): {
if (sex === Sex.Male) {
// 310.2 + (63.3*MP) - 0.263*MP^2 + 14, -15%/+15% for light/intense TEE
- res = [310.2, 63.3, -0.263, 14, 15, 15];
+ res = [310.2, 63.3, -0.263, 14, -15, 15];
} else if (sex === Sex.Female) {
// 263.4 + (65.3*MP) - 0.454*MP^2 + 0, -15%/+15% for light/intense TEE
- res = [263.4, 65.3, -0.454, 0, 15, 15];
+ res = [263.4, 65.3, -0.454, 0, -15, 15];
}
break;
}
--
GitLab