diff --git a/src/Controllers/CalculatorController.ts b/src/Controllers/CalculatorController.ts
index ddd2d3bc3c51c20294079d69ccad2cebe58db97a..6b47998e7a9fa54d5c7db13ade3b232970ef014b 100644
--- a/src/Controllers/CalculatorController.ts
+++ b/src/Controllers/CalculatorController.ts
@@ -11,8 +11,9 @@ const getREP: Handler = async (req: Request, res: Response) => {
const { groups } = req.body;
const { extraData } = req.body;
try {
- const EnergyReq:
- CalculatorResponse = CalculatorService.calculateEnergeticRequirement(groups, extraData);
+ // sry pero no sabia como sacarle un caracter a esa linea :(
+ // eslint-disable-next-line max-len
+ const EnergyReq: CalculatorResponse = await CalculatorService.calculateEnergeticRequirement(groups, extraData);
return res.status(200).send(EnergyReq);
} catch (error) {
const e = error as Error;
diff --git a/src/Controllers/ParameterController.ts b/src/Controllers/ParameterController.ts
index 926cb28de31cb9ca4aa7de763c97d8136657c871..72c9fb4f96454c8296b7141ad799c5cd0247ec1b 100644
--- a/src/Controllers/ParameterController.ts
+++ b/src/Controllers/ParameterController.ts
@@ -8,14 +8,14 @@ import ParameterService from '../Services/ParameterService';
const router = Router();
const getParameters: Handler = async (req: Request, res: Response) => {
- try {
- const parameters = await ParameterService.getParameters();
- return res.status(200).send(parameters);
- } catch (error) {
- const e = error as Error;
- logger.info(e.message);
- return res.status(400).json({ error: e.message });
- }
+ // try {
+ // const parameters = await ParameterService.getParameters();
+ // return res.status(200).send(parameters);
+ // } catch (error) {
+ // const e = error as Error;
+ // logger.info(e.message);
+ // return res.status(400).json({ error: e.message });
+ // }
};
const getParametersOfType: Handler = async (req: Request, res: Response) => {
diff --git a/src/DTOs/MinorPALDTO.ts b/src/DTOs/MinorPALDTO.ts
index 9633fca698d9fbbdac8092cab49ae03f75467c11..75b39bd4b6272e007b03fcb2b22e2e3ccf7c8789 100644
--- a/src/DTOs/MinorPALDTO.ts
+++ b/src/DTOs/MinorPALDTO.ts
@@ -1,5 +1,5 @@
type MinorPAL = {
- lowPalPrevalence: number;
+ lowPALPrevalence: number;
moderatePALPrevalence: number;
intensePALPrevalence: number;
};
diff --git a/src/Loaders/DefaultExtraDataLoader.csv b/src/Loaders/DefaultExtraDataLoader.csv
index 99f6206d3a703bffefcfa5605241b107542de507..b1f473da44a3573594cfd01cdc40a6981b9f8912 100644
--- a/src/Loaders/DefaultExtraDataLoader.csv
+++ b/src/Loaders/DefaultExtraDataLoader.csv
@@ -15,10 +15,10 @@ urbanLowPALValue,1.55,NAF Adultos,2,a
ruralActivePALValue,1.95,NAF Adultos,3,a
ruralLowPALValue,1.65,NAF Adultos,4,a
countryPopulation,3453691,Embarazo y lactancia,0,a
-18-29FemaleCountryPopulation,315790,Embarazo y lactancia,0,a
-30-59FemaleCountryPopulation,660601,Embarazo y lactancia,0,a
+18to29FemaleCountryPopulation,315790,Embarazo y lactancia,0,a
+30to59FemaleCountryPopulation,660601,Embarazo y lactancia,0,a
birthRate,14,Embarazo y lactancia,0,a
-pregnancyExtraEnergy18to29,208,Embarazo y lactancia,1,a
-lactationExtraEnergy18to29,251,Embarazo y lactancia,2,a
-pregnancyExtraEnergy30to59,208,Embarazo y lactancia,1,a
-lactationExtraEnergy30to59,251,Embarazo y lactancia,2,a
\ No newline at end of file
+pregnancyExtraEnergy18to29,208,Embarazo y lactancia,5,a
+lactationExtraEnergy18to29,251,Embarazo y lactancia,6,a
+pregnancyExtraEnergy30to59,208,Embarazo y lactancia,5,a
+lactationExtraEnergy30to59,251,Embarazo y lactancia,6,a
diff --git a/src/Loaders/DefaultWeightLoader.csv b/src/Loaders/DefaultWeightLoader.csv
index 8bec941e9586b1f92e96e0f05a142f4d10d238c6..5c7412ec4b3bc4abca68d76a1c8a5a3a5a767b87 100644
--- a/src/Loaders/DefaultWeightLoader.csv
+++ b/src/Loaders/DefaultWeightLoader.csv
@@ -1,65 +1,65 @@
age,value,sex
-0Month,3.3,Male
-1Month,4.5,Male
-2Month,5.6,Male
-3Month,6.4,Male
-4Month,7,Male
-5Month,7.5,Male
-6Month,7.9,Male
-7Month,8.3,Male
-8Month,8.6,Male
-9Month,8.9,Male
-10Month,9.2,Male
-11Month,9.4,Male
-1Year,10.9,Male
-2Year,13.3,Male
-3Year,15.3,Male
-4Year,17.3,Male
-5Year,19.5,Male
-6Year,21.8,Male
-7Year,24.2,Male
-8Year,26.8,Male
-9Year,29.6,Male
-10Year,32.9,Male
-11Year,36.7,Male
-12Year,41.6,Male
-13Year,47.4,Male
-14Year,53.7,Male
-15Year,58.8,Male
-16Year,63.1,Male
-17Year,66.1,Male
-18to29Year,67.4,Male
-30to59Year,66.6,Male
-60+Year,64.3,Male
-0Month,3.2,Female
-1Month,4.2,Female
-2Month,5.1,Female
-3Month,5.8,Female
-4Month,6.4,Female
-5Month,6.9,Female
-6Month,7.3,Female
-7Month,7.6,Female
-8Month,7.9,Female
-9Month,8.2,Female
-10Month,8.5,Female
-11Month,8.7,Female
-1Year,10.2,Female
-2Year,12.7,Female
-3Year,15,Female
-4Year,17.2,Female
-5Year,19.1,Female
-6Year,21.3,Female
-7Year,23.7,Female
-8Year,26.7,Female
-9Year,29.9,Female
-10Year,34,Female
-11Year,38.7,Female
-12Year,43.6,Female
-13Year,48.1,Female
-14Year,51.5,Female
-15Year,53.9,Female
-16Year,55.3,Female
-17Year,56.3,Female
-18to29Year,57.7,Female
-30to59Year,56.3,Female
-60+Year,54.2,Female
\ No newline at end of file
+0 meses,3.3,Masculino
+1 mes,4.5,Masculino
+2 meses,5.6,Masculino
+3 meses,6.4,Masculino
+4 meses,7,Masculino
+5 meses,7.5,Masculino
+6 meses,7.9,Masculino
+7 meses,8.3,Masculino
+8 meses,8.6,Masculino
+9 meses,8.9,Masculino
+10 meses,9.2,Masculino
+11 mes,9.4,Masculino
+1 año,10.9,Masculino
+2 años,13.3,Masculino
+3 años,15.3,Masculino
+4 años,17.3,Masculino
+5 años,19.5,Masculino
+6 años,21.8,Masculino
+7 años,24.2,Masculino
+8 años,26.8,Masculino
+9 años,29.6,Masculino
+10 años,32.9,Masculino
+11 año,36.7,Masculino
+12 años,41.6,Masculino
+13 años,47.4,Masculino
+14 años,53.7,Masculino
+15 años,58.8,Masculino
+16 años,63.1,Masculino
+17 años,66.1,Masculino
+18-29 años,67.4,Masculino
+30-59 años,66.6,Masculino
+60+ años,64.3,Masculino
+0 meses,3.2,Femenino
+1 mes,4.2,Femenino
+2 meses,5.1,Femenino
+3 meses,5.8,Femenino
+4 meses,6.4,Femenino
+5 meses,6.9,Femenino
+6 meses,7.3,Femenino
+7 meses,7.6,Femenino
+8 meses,7.9,Femenino
+9 meses,8.2,Femenino
+10 meses,8.5,Femenino
+11 mes,8.7,Femenino
+1 año,10.2,Femenino
+2 años,12.7,Femenino
+3 años,15,Femenino
+4 años,17.2,Femenino
+5 años,19.1,Femenino
+6 años,21.3,Femenino
+7 años,23.7,Femenino
+8 años,26.7,Femenino
+9 años,29.9,Femenino
+10 años,34,Femenino
+11 año,38.7,Femenino
+12 años,43.6,Femenino
+13 años,48.1,Femenino
+14 años,51.5,Femenino
+15 años,53.9,Femenino
+16 años,55.3,Femenino
+17 años,56.3,Femenino
+18-29 años,57.7,Femenino
+30-59 años,56.3,Femenino
+60+ años,54.2,Femenino
diff --git a/src/Loaders/EquationConstantLoader.csv b/src/Loaders/EquationConstantLoader.csv
index fb9b7ce7081497a6116fc397d2ce0fdcd04ae71c..616d7b09162f6bf8d6dedc4fff5209140854be83 100644
--- a/src/Loaders/EquationConstantLoader.csv
+++ b/src/Loaders/EquationConstantLoader.csv
@@ -1,221 +1,221 @@
age,value,parameterType,sex,order,description
-18to29Year,15.057,TMB,Male,0,a
-18to29Year,692.2,TMB,Male,1,a
-30to59Year,11.472,TMB,Male,0,a
-30to59Year,873.1,TMB,Male,1,a
-60+Year,11.711,TMB,Male,0,a
-60+Year,587.7,TMB,Male,1,a
-18to29Year,14.818,TMB,Female,0,a
-18to29Year,486.6,TMB,Female,1,a
-30to59Year,8.126,TMB,Female,0,a
-30to59Year,845.6,TMB,Female,1,a
-60+Year,9.082,TMB,Female,0,a
-60+Year,658.5,TMB,Female,1,a
-0Month,211,Energia para crecimiento,Male,2,a
-1Month,183,Energia para crecimiento,Male,2,a
-2Month,139,Energia para crecimiento,Male,2,a
-3Month,53,Energia para crecimiento,Male,2,a
-4Month,46,Energia para crecimiento,Male,2,a
-5Month,36,Energia para crecimiento,Male,2,a
-6Month,17,Energia para crecimiento,Male,2,a
-7Month,16,Energia para crecimiento,Male,2,a
-8Month,14,Energia para crecimiento,Male,2,a
-9Month,21,Energia para crecimiento,Male,2,a
-10Month,21,Energia para crecimiento,Male,2,a
-11Month,22,Energia para crecimiento,Male,2,a
-1Year,13,Energia para crecimiento,Male,3,a
-2Year,12,Energia para crecimiento,Male,3,a
-3Year,12,Energia para crecimiento,Male,3,a
-4Year,11,Energia para crecimiento,Male,3,a
-5Year,11,Energia para crecimiento,Male,3,a
-6Year,12,Energia para crecimiento,Male,3,a
-7Year,14,Energia para crecimiento,Male,3,a
-8Year,16,Energia para crecimiento,Male,3,a
-9Year,19,Energia para crecimiento,Male,3,a
-10Year,22,Energia para crecimiento,Male,3,a
-11Year,25,Energia para crecimiento,Male,3,a
-12Year,29,Energia para crecimiento,Male,3,a
-13Year,33,Energia para crecimiento,Male,3,a
-14Year,33,Energia para crecimiento,Male,3,a
-15Year,31,Energia para crecimiento,Male,3,a
-16Year,24,Energia para crecimiento,Male,3,a
-17Year,14,Energia para crecimiento,Male,3,a
-0Month,178,Energia para crecimiento,Female,2,a
-1Month,161,Energia para crecimiento,Female,2,a
-2Month,134,Energia para crecimiento,Female,2,a
-3Month,68,Energia para crecimiento,Female,2,a
-4Month,57,Energia para crecimiento,Female,2,a
-5Month,47,Energia para crecimiento,Female,2,a
-6Month,20,Energia para crecimiento,Female,2,a
-7Month,17,Energia para crecimiento,Female,2,a
-8Month,15,Energia para crecimiento,Female,2,a
-9Month,18,Energia para crecimiento,Female,2,a
-10Month,15,Energia para crecimiento,Female,2,a
-11Month,14,Energia para crecimiento,Female,2,a
-1Year,13,Energia para crecimiento,Female,3,a
-2Year,13,Energia para crecimiento,Female,3,a
-3Year,11,Energia para crecimiento,Female,3,a
-4Year,10,Energia para crecimiento,Female,3,a
-5Year,10,Energia para crecimiento,Female,3,a
-6Year,13,Energia para crecimiento,Female,3,a
-7Year,17,Energia para crecimiento,Female,3,a
-8Year,20,Energia para crecimiento,Female,3,a
-9Year,23,Energia para crecimiento,Female,3,a
-10Year,25,Energia para crecimiento,Female,3,a
-11Year,25,Energia para crecimiento,Female,3,a
-12Year,26,Energia para crecimiento,Female,3,a
-13Year,24,Energia para crecimiento,Female,3,a
-14Year,19,Energia para crecimiento,Female,3,a
-15Year,13,Energia para crecimiento,Female,3,a
-16Year,5,Energia para crecimiento,Female,3,a
-17Year,0,Energia para crecimiento,Female,3,a
-0Month,-152,GET,Male,0,a
-0Month,92.8,GET,Male,1,a
-1Month,-152,GET,Male,0,a
-1Month,92.8,GET,Male,1,a
-2Month,-152,GET,Male,0,a
-2Month,92.8,GET,Male,1,a
-3Month,-152,GET,Male,0,a
-3Month,92.8,GET,Male,1,a
-4Month,-152,GET,Male,0,a
-4Month,92.8,GET,Male,1,a
-5Month,-152,GET,Male,0,a
-5Month,92.8,GET,Male,1,a
-0Month,-152,GET,Female,0,a
-0Month,92.8,GET,Female,1,a
-1Month,-152,GET,Female,0,a
-1Month,92.8,GET,Female,1,a
-2Month,-152,GET,Female,0,a
-2Month,92.8,GET,Female,1,a
-3Month,-152,GET,Female,0,a
-3Month,92.8,GET,Female,1,a
-4Month,-152,GET,Female,0,a
-4Month,92.8,GET,Female,1,a
-5Month,-152,GET,Female,0,a
-5Month,92.8,GET,Female,1,a
-6Month,-99.4,GET,Male,0,a
-6Month,88.6,GET,Male,1,a
-7Month,-99.4,GET,Male,0,a
-7Month,88.6,GET,Male,1,a
-8Month,-99.4,GET,Male,0,a
-8Month,88.6,GET,Male,1,a
-9Month,-99.4,GET,Male,0,a
-9Month,88.6,GET,Male,1,a
-10Month,-99.4,GET,Male,0,a
-10Month,88.6,GET,Male,1,a
-11Month,-99.4,GET,Male,0,a
-11Month,88.6,GET,Male,1,a
-6Month,-99.4,GET,Female,0,a
-6Month,88.6,GET,Female,1,a
-7Month,-99.4,GET,Female,0,a
-7Month,88.6,GET,Female,1,a
-8Month,-99.4,GET,Female,0,a
-8Month,88.6,GET,Female,1,a
-9Month,-99.4,GET,Female,0,a
-9Month,88.6,GET,Female,1,a
-10Month,-99.4,GET,Female,0,a
-10Month,88.6,GET,Female,1,a
-11Month,-99.4,GET,Female,0,a
-11Month,88.6,GET,Female,1,a
-1Year,310.2,GET,Male,0,a
-1Year,63.3,GET,Male,1,a
-1Year,-0.263,GET,Male,2,a
-2Year,310.2,GET,Male,0,a
-2Year,63.3,GET,Male,1,a
-2Year,-0.263,GET,Male,2,a
-3Year,310.2,GET,Male,0,a
-3Year,63.3,GET,Male,1,a
-3Year,-0.263,GET,Male,2,a
-4Year,310.2,GET,Male,0,a
-4Year,63.3,GET,Male,1,a
-4Year,-0.263,GET,Male,2,a
-5Year,310.2,GET,Male,0,a
-5Year,63.3,GET,Male,1,a
-5Year,-0.263,GET,Male,2,a
-6Year,310.2,GET,Male,0,a
-6Year,63.3,GET,Male,1,a
-6Year,-0.263,GET,Male,2,a
-7Year,310.2,GET,Male,0,a
-7Year,63.3,GET,Male,1,a
-7Year,-0.263,GET,Male,2,a
-8Year,310.2,GET,Male,0,a
-8Year,63.3,GET,Male,1,a
-8Year,-0.263,GET,Male,2,a
-9Year,310.2,GET,Male,0,a
-9Year,63.3,GET,Male,1,a
-9Year,-0.263,GET,Male,2,a
-10Year,310.2,GET,Male,0,a
-10Year,63.3,GET,Male,1,a
-10Year,-0.263,GET,Male,2,a
-11Year,310.2,GET,Male,0,a
-11Year,63.3,GET,Male,1,a
-11Year,-0.263,GET,Male,2,a
-12Year,310.2,GET,Male,0,a
-12Year,63.3,GET,Male,1,a
-12Year,-0.263,GET,Male,2,a
-13Year,310.2,GET,Male,0,a
-13Year,63.3,GET,Male,1,a
-13Year,-0.263,GET,Male,2,a
-14Year,310.2,GET,Male,0,a
-14Year,63.3,GET,Male,1,a
-14Year,-0.263,GET,Male,2,a
-15Year,310.2,GET,Male,0,a
-15Year,63.3,GET,Male,1,a
-15Year,-0.263,GET,Male,2,a
-16Year,310.2,GET,Male,0,a
-16Year,63.3,GET,Male,1,a
-16Year,-0.263,GET,Male,2,a
-17Year,310.2,GET,Male,0,a
-17Year,63.3,GET,Male,1,a
-17Year,-0.263,GET,Male,2,a
-1Year,263.4,GET,Female,0,a
-1Year,65.3,GET,Female,1,a
-1Year,-0.454,GET,Female,2,a
-2Year,263.4,GET,Female,0,a
-2Year,65.3,GET,Female,1,a
-2Year,-0.454,GET,Female,2,a
-3Year,263.4,GET,Female,0,a
-3Year,65.3,GET,Female,1,a
-3Year,-0.454,GET,Female,2,a
-4Year,263.4,GET,Female,0,a
-4Year,65.3,GET,Female,1,a
-4Year,-0.454,GET,Female,2,a
-5Year,263.4,GET,Female,0,a
-5Year,65.3,GET,Female,1,a
-5Year,-0.454,GET,Female,2,a
-6Year,263.4,GET,Female,0,a
-6Year,65.3,GET,Female,1,a
-6Year,-0.454,GET,Female,2,a
-7Year,263.4,GET,Female,0,a
-7Year,65.3,GET,Female,1,a
-7Year,-0.454,GET,Female,2,a
-8Year,263.4,GET,Female,0,a
-8Year,65.3,GET,Female,1,a
-8Year,-0.454,GET,Female,2,a
-9Year,263.4,GET,Female,0,a
-9Year,65.3,GET,Female,1,a
-9Year,-0.454,GET,Female,2,a
-10Year,263.4,GET,Female,0,a
-10Year,65.3,GET,Female,1,a
-10Year,-0.454,GET,Female,2,a
-11Year,263.4,GET,Female,0,a
-11Year,65.3,GET,Female,1,a
-11Year,-0.454,GET,Female,2,a
-12Year,263.4,GET,Female,0,a
-12Year,65.3,GET,Female,1,a
-12Year,-0.454,GET,Female,2,a
-13Year,263.4,GET,Female,0,a
-13Year,65.3,GET,Female,1,a
-13Year,-0.454,GET,Female,2,a
-14Year,263.4,GET,Female,0,a
-14Year,65.3,GET,Female,1,a
-14Year,-0.454,GET,Female,2,a
-15Year,263.4,GET,Female,0,a
-15Year,65.3,GET,Female,1,a
-15Year,-0.454,GET,Female,2,a
-16Year,263.4,GET,Female,0,a
-16Year,65.3,GET,Female,1,a
-16Year,-0.454,GET,Female,2,a
-17Year,263.4,GET,Female,0,a
-17Year,65.3,GET,Female,1,a
-17Year,-0.454,GET,Female,2,a
\ No newline at end of file
+18-29 años,15.057,TMB,Masculino,0,a
+18-29 años,692.2,TMB,Masculino,1,a
+30-59 años,11.472,TMB,Masculino,0,a
+30-59 años,873.1,TMB,Masculino,1,a
+60+ años,11.711,TMB,Masculino,0,a
+60+ años,587.7,TMB,Masculino,1,a
+18-29 años,14.818,TMB,Femenino,0,a
+18-29 años,486.6,TMB,Femenino,1,a
+30-59 años,8.126,TMB,Femenino,0,a
+30-59 años,845.6,TMB,Femenino,1,a
+60+ años,9.082,TMB,Femenino,0,a
+60+ años,658.5,TMB,Femenino,1,a
+0 meses,211,Energia para crecimiento,Masculino,2,a
+1 mes,183,Energia para crecimiento,Masculino,2,a
+2 meses,139,Energia para crecimiento,Masculino,2,a
+3 meses,53,Energia para crecimiento,Masculino,2,a
+4 meses,46,Energia para crecimiento,Masculino,2,a
+5 meses,36,Energia para crecimiento,Masculino,2,a
+6 meses,17,Energia para crecimiento,Masculino,2,a
+7 meses,16,Energia para crecimiento,Masculino,2,a
+8 meses,14,Energia para crecimiento,Masculino,2,a
+9 meses,21,Energia para crecimiento,Masculino,2,a
+10 meses,21,Energia para crecimiento,Masculino,2,a
+11 meses,22,Energia para crecimiento,Masculino,2,a
+1 año,13,Energia para crecimiento,Masculino,3,a
+2 años,12,Energia para crecimiento,Masculino,3,a
+3 años,12,Energia para crecimiento,Masculino,3,a
+4 años,11,Energia para crecimiento,Masculino,3,a
+5 años,11,Energia para crecimiento,Masculino,3,a
+6 años,12,Energia para crecimiento,Masculino,3,a
+7 años,14,Energia para crecimiento,Masculino,3,a
+8 años,16,Energia para crecimiento,Masculino,3,a
+9 años,19,Energia para crecimiento,Masculino,3,a
+10 años,22,Energia para crecimiento,Masculino,3,a
+11 año,25,Energia para crecimiento,Masculino,3,a
+12 años,29,Energia para crecimiento,Masculino,3,a
+13 años,33,Energia para crecimiento,Masculino,3,a
+14 años,33,Energia para crecimiento,Masculino,3,a
+15 años,31,Energia para crecimiento,Masculino,3,a
+16 años,24,Energia para crecimiento,Masculino,3,a
+17 años,14,Energia para crecimiento,Masculino,3,a
+0 meses,178,Energia para crecimiento,Femenino,2,a
+1 mes,161,Energia para crecimiento,Femenino,2,a
+2 meses,134,Energia para crecimiento,Femenino,2,a
+3 meses,68,Energia para crecimiento,Femenino,2,a
+4 meses,57,Energia para crecimiento,Femenino,2,a
+5 meses,47,Energia para crecimiento,Femenino,2,a
+6 meses,20,Energia para crecimiento,Femenino,2,a
+7 meses,17,Energia para crecimiento,Femenino,2,a
+8 meses,15,Energia para crecimiento,Femenino,2,a
+9 meses,18,Energia para crecimiento,Femenino,2,a
+10 meses,15,Energia para crecimiento,Femenino,2,a
+11 meses,14,Energia para crecimiento,Femenino,2,a
+1 año,13,Energia para crecimiento,Femenino,3,a
+2 años,13,Energia para crecimiento,Femenino,3,a
+3 años,11,Energia para crecimiento,Femenino,3,a
+4 años,10,Energia para crecimiento,Femenino,3,a
+5 años,10,Energia para crecimiento,Femenino,3,a
+6 años,13,Energia para crecimiento,Femenino,3,a
+7 años,17,Energia para crecimiento,Femenino,3,a
+8 años,20,Energia para crecimiento,Femenino,3,a
+9 años,23,Energia para crecimiento,Femenino,3,a
+10 años,25,Energia para crecimiento,Femenino,3,a
+11 año,25,Energia para crecimiento,Femenino,3,a
+12 años,26,Energia para crecimiento,Femenino,3,a
+13 años,24,Energia para crecimiento,Femenino,3,a
+14 años,19,Energia para crecimiento,Femenino,3,a
+15 años,13,Energia para crecimiento,Femenino,3,a
+16 años,5,Energia para crecimiento,Femenino,3,a
+17 años,0,Energia para crecimiento,Femenino,3,a
+0 meses,-152,GET,Masculino,0,a
+0 meses,92.8,GET,Masculino,1,a
+1 mes,-152,GET,Masculino,0,a
+1 mes,92.8,GET,Masculino,1,a
+2 meses,-152,GET,Masculino,0,a
+2 meses,92.8,GET,Masculino,1,a
+3 meses,-152,GET,Masculino,0,a
+3 meses,92.8,GET,Masculino,1,a
+4 meses,-152,GET,Masculino,0,a
+4 meses,92.8,GET,Masculino,1,a
+5 meses,-152,GET,Masculino,0,a
+5 meses,92.8,GET,Masculino,1,a
+0 meses,-152,GET,Femenino,0,a
+0 meses,92.8,GET,Femenino,1,a
+1 mes,-152,GET,Femenino,0,a
+1 mes,92.8,GET,Femenino,1,a
+2 meses,-152,GET,Femenino,0,a
+2 meses,92.8,GET,Femenino,1,a
+3 meses,-152,GET,Femenino,0,a
+3 meses,92.8,GET,Femenino,1,a
+4 meses,-152,GET,Femenino,0,a
+4 meses,92.8,GET,Femenino,1,a
+5 meses,-152,GET,Femenino,0,a
+5 meses,92.8,GET,Femenino,1,a
+6 meses,-99.4,GET,Masculino,0,a
+6 meses,88.6,GET,Masculino,1,a
+7 meses,-99.4,GET,Masculino,0,a
+7 meses,88.6,GET,Masculino,1,a
+8 meses,-99.4,GET,Masculino,0,a
+8 meses,88.6,GET,Masculino,1,a
+9 meses,-99.4,GET,Masculino,0,a
+9 meses,88.6,GET,Masculino,1,a
+10 meses,-99.4,GET,Masculino,0,a
+10 meses,88.6,GET,Masculino,1,a
+11 meses,-99.4,GET,Masculino,0,a
+11 meses,88.6,GET,Masculino,1,a
+6 meses,-99.4,GET,Femenino,0,a
+6 meses,88.6,GET,Femenino,1,a
+7 meses,-99.4,GET,Femenino,0,a
+7 meses,88.6,GET,Femenino,1,a
+8 meses,-99.4,GET,Femenino,0,a
+8 meses,88.6,GET,Femenino,1,a
+9 meses,-99.4,GET,Femenino,0,a
+9 meses,88.6,GET,Femenino,1,a
+10 meses,-99.4,GET,Femenino,0,a
+10 meses,88.6,GET,Femenino,1,a
+11 meses,-99.4,GET,Femenino,0,a
+11 meses,88.6,GET,Femenino,1,a
+1 año,310.2,GET,Masculino,0,a
+1 año,63.3,GET,Masculino,1,a
+1 año,-0.263,GET,Masculino,2,a
+2 años,310.2,GET,Masculino,0,a
+2 años,63.3,GET,Masculino,1,a
+2 años,-0.263,GET,Masculino,2,a
+3 años,310.2,GET,Masculino,0,a
+3 años,63.3,GET,Masculino,1,a
+3 años,-0.263,GET,Masculino,2,a
+4 años,310.2,GET,Masculino,0,a
+4 años,63.3,GET,Masculino,1,a
+4 años,-0.263,GET,Masculino,2,a
+5 años,310.2,GET,Masculino,0,a
+5 años,63.3,GET,Masculino,1,a
+5 años,-0.263,GET,Masculino,2,a
+6 años,310.2,GET,Masculino,0,a
+6 años,63.3,GET,Masculino,1,a
+6 años,-0.263,GET,Masculino,2,a
+7 años,310.2,GET,Masculino,0,a
+7 años,63.3,GET,Masculino,1,a
+7 años,-0.263,GET,Masculino,2,a
+8 años,310.2,GET,Masculino,0,a
+8 años,63.3,GET,Masculino,1,a
+8 años,-0.263,GET,Masculino,2,a
+9 años,310.2,GET,Masculino,0,a
+9 años,63.3,GET,Masculino,1,a
+9 años,-0.263,GET,Masculino,2,a
+10 años,310.2,GET,Masculino,0,a
+10 años,63.3,GET,Masculino,1,a
+10 años,-0.263,GET,Masculino,2,a
+11 año,310.2,GET,Masculino,0,a
+11 año,63.3,GET,Masculino,1,a
+11 año,-0.263,GET,Masculino,2,a
+12 años,310.2,GET,Masculino,0,a
+12 años,63.3,GET,Masculino,1,a
+12 años,-0.263,GET,Masculino,2,a
+13 años,310.2,GET,Masculino,0,a
+13 años,63.3,GET,Masculino,1,a
+13 años,-0.263,GET,Masculino,2,a
+14 años,310.2,GET,Masculino,0,a
+14 años,63.3,GET,Masculino,1,a
+14 años,-0.263,GET,Masculino,2,a
+15 años,310.2,GET,Masculino,0,a
+15 años,63.3,GET,Masculino,1,a
+15 años,-0.263,GET,Masculino,2,a
+16 años,310.2,GET,Masculino,0,a
+16 años,63.3,GET,Masculino,1,a
+16 años,-0.263,GET,Masculino,2,a
+17 años,310.2,GET,Masculino,0,a
+17 años,63.3,GET,Masculino,1,a
+17 años,-0.263,GET,Masculino,2,a
+1 año,263.4,GET,Femenino,0,a
+1 año,65.3,GET,Femenino,1,a
+1 año,-0.454,GET,Femenino,2,a
+2 años,263.4,GET,Femenino,0,a
+2 años,65.3,GET,Femenino,1,a
+2 años,-0.454,GET,Femenino,2,a
+3 años,263.4,GET,Femenino,0,a
+3 años,65.3,GET,Femenino,1,a
+3 años,-0.454,GET,Femenino,2,a
+4 años,263.4,GET,Femenino,0,a
+4 años,65.3,GET,Femenino,1,a
+4 años,-0.454,GET,Femenino,2,a
+5 años,263.4,GET,Femenino,0,a
+5 años,65.3,GET,Femenino,1,a
+5 años,-0.454,GET,Femenino,2,a
+6 años,263.4,GET,Femenino,0,a
+6 años,65.3,GET,Femenino,1,a
+6 años,-0.454,GET,Femenino,2,a
+7 años,263.4,GET,Femenino,0,a
+7 años,65.3,GET,Femenino,1,a
+7 años,-0.454,GET,Femenino,2,a
+8 años,263.4,GET,Femenino,0,a
+8 años,65.3,GET,Femenino,1,a
+8 años,-0.454,GET,Femenino,2,a
+9 años,263.4,GET,Femenino,0,a
+9 años,65.3,GET,Femenino,1,a
+9 años,-0.454,GET,Femenino,2,a
+10 años,263.4,GET,Femenino,0,a
+10 años,65.3,GET,Femenino,1,a
+10 años,-0.454,GET,Femenino,2,a
+11 año,263.4,GET,Femenino,0,a
+11 año,65.3,GET,Femenino,1,a
+11 año,-0.454,GET,Femenino,2,a
+12 años,263.4,GET,Femenino,0,a
+12 años,65.3,GET,Femenino,1,a
+12 años,-0.454,GET,Femenino,2,a
+13 años,263.4,GET,Femenino,0,a
+13 años,65.3,GET,Femenino,1,a
+13 años,-0.454,GET,Femenino,2,a
+14 años,263.4,GET,Femenino,0,a
+14 años,65.3,GET,Femenino,1,a
+14 años,-0.454,GET,Femenino,2,a
+15 años,263.4,GET,Femenino,0,a
+15 años,65.3,GET,Femenino,1,a
+15 años,-0.454,GET,Femenino,2,a
+16 años,263.4,GET,Femenino,0,a
+16 años,65.3,GET,Femenino,1,a
+16 años,-0.454,GET,Femenino,2,a
+17 años,263.4,GET,Femenino,0,a
+17 años,65.3,GET,Femenino,1,a
+17 años,-0.454,GET,Femenino,2,a
diff --git a/src/Services/CalculatorService.ts b/src/Services/CalculatorService.ts
index e101097a1e18a0c57af9234a09855bc422b77de5..b1e072a825e37d13bba0314682c1c459af8b3e16 100644
--- a/src/Services/CalculatorService.ts
+++ b/src/Services/CalculatorService.ts
@@ -7,13 +7,14 @@ import AgeGroupJSON from '../DTOs/AgeGroupJSON';
import ExtraData from '../DTOs/ExtraDataDTO';
// eslint-disable-next-line max-len
-const calculateEnergeticRequirement = (groups: AgeGroupJSON[], data: ExtraData): CalculatorResponse => {
+const calculateEnergeticRequirement = async (groups: AgeGroupJSON[], data: ExtraData): Promise<CalculatorResponse> => {
const parameters = new Map<number[], AgeGroup>();
const ageGroups = ParserService.parseGroups(groups);
- ageGroups.forEach((group: AgeGroup) => {
- parameters.set(ParameterService.getEquationValues(group.age, group.sex), group);
- });
+ await Promise.all(ageGroups.map(async (group: AgeGroup) => {
+ const arr: number[] = await ParameterService.getEquationValues(group.age, group.sex);
+ parameters.set(arr, group);
+ }));
const res: CalculatorResponse = ERCalculator.calculateER(parameters, data);
return res;
diff --git a/src/Services/ERCalculator.ts b/src/Services/ERCalculator.ts
index b75ec53f40bcb868ec6a2e9939c9c8dec0399fd9..c7024d3b79663dc15f182ee9942c6384e9f9beee 100644
--- a/src/Services/ERCalculator.ts
+++ b/src/Services/ERCalculator.ts
@@ -28,7 +28,7 @@ const calculateTEE = (group: AgeGroup, params: number[], preval: MinorPAL): numb
const teeLow: number = teeModerate - (teeModerate * params[4]) / 100;
const teeIntense: number = teeModerate + (teeModerate * params[5]) / 100;
- const ret: number = (teeLow * preval.lowPalPrevalence) / 100
+ const ret: number = (teeLow * preval.lowPALPrevalence) / 100
+ (teeModerate * preval.moderatePALPrevalence) / 100
+ (teeIntense * preval.intensePALPrevalence) / 100;
diff --git a/src/Services/ParameterService.ts b/src/Services/ParameterService.ts
index 7d8c34288f0e3982c4b0ecdae1e237e19df990bd..73942adbecc44cf1a83b9728f412c2c0a605e560 100644
--- a/src/Services/ParameterService.ts
+++ b/src/Services/ParameterService.ts
@@ -1,354 +1,503 @@
-import ParameterDTO from '../DTOs/EquationConstantDTO';
+import { Op } from 'sequelize';
+import DefaultExtraDataDTO from '../DTOs/DefaultExtraDataDTO';
+import EquationConstantDTO from '../DTOs/EquationConstantDTO';
import AgeBracket from '../Enum/AgeBracket';
import Sex from '../Enum/Sex';
import ParameterMapper from '../Mappers/ParameterMapper';
-import Parameter from '../Models/Parameter';
+import DefaultExtraData from '../Models/DefaultExtraData';
+import EquationConstant from '../Models/EquationConstant';
-const getEquationValues = (ageBracket: AgeBracket, sex: Sex): number[] => {
- let res: number[] = [];
+const getEquationValues = async (ageBracket: AgeBracket, sex: Sex): Promise<number[]> => {
+ const res: number[] = [];
+ await EquationConstant.findAll({
+ where: {
+ ageRange: ageBracket as string,
+ sex: sex as string,
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: EquationConstant[]) => {
+ rows.forEach((row: EquationConstant) => {
+ const constant: EquationConstantDTO = ParameterMapper.equationConstantToDTO(row);
+ res.push(constant.value);
+ });
+ });
switch (ageBracket) {
- case (AgeBracket.m0): {
- if (sex === Sex.Male) {
- // -152 + (92.8*MP) + 211
- res = [-152, 92.8, 211];
- } else if (sex === Sex.Female) {
- // -152 + (92.8*MP) + 178
- res = [-152, 92.8, 178];
- }
- break;
- }
- case (AgeBracket.m1): {
- if (sex === Sex.Male) {
- // -152 + (92.8*MP) + 183
- res = [-152, 92.8, 183];
- } else if (sex === Sex.Female) {
- // -152 + (92.8*MP) + 161
- res = [-152, 92.8, 161];
- }
- break;
- }
- case (AgeBracket.m2): {
- if (sex === Sex.Male) {
- // -152 + (92.8*MP) + 139
- res = [-152, 92.8, 139];
- } else if (sex === Sex.Female) {
- // -152 + (92.8*MP) + 134
- res = [-152, 92.8, 134];
- }
- break;
- }
- case (AgeBracket.m3): {
- if (sex === Sex.Male) {
- // -152 + (92.8*MP) + 53
- res = [-152, 92.8, 53];
- } else if (sex === Sex.Female) {
- // -152 + (92.8*MP) + 68
- res = [-152, 92.8, 68];
- }
- break;
- }
- case (AgeBracket.m4): {
- if (sex === Sex.Male) {
- // -152 + (92.8*MP) + 46
- res = [-152, 92.8, 46];
- } else if (sex === Sex.Female) {
- // -152 + (92.8*MP) + 57
- res = [-152, 92.8, 57];
- }
+ case AgeBracket.a6:
+ case AgeBracket.a7:
+ case AgeBracket.a8:
+ case AgeBracket.a9:
+ case AgeBracket.a10:
+ case AgeBracket.a11:
+ case AgeBracket.a12:
+ case AgeBracket.a13:
+ case AgeBracket.a14:
+ case AgeBracket.a15:
+ case AgeBracket.a16:
+ case AgeBracket.a17: {
+ await DefaultExtraData.findAll({
+ where: {
+ parameterType: 'NAF Menores',
+ order: [1, 2],
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: DefaultExtraData[]) => {
+ rows.forEach((row: DefaultExtraData) => {
+ const constant: DefaultExtraDataDTO = ParameterMapper.defaultExtraDataToDTO(row);
+ res.push(constant.value);
+ });
+ });
+ break;
+ }
+ case AgeBracket.a18_29: {
+ if (sex === Sex.Female) {
+ await DefaultExtraData.findAll({
+ where: {
+ [Op.or]: [
+ { parameterType: 'NAF Adultos' },
+ {
+ id: ['pregnancyExtraEnergy18to29', 'lactationExtraEnergy18to29'],
+ },
+ ],
+ order: {
+ [Op.gt]: 0,
+ },
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: DefaultExtraData[]) => {
+ rows.forEach((row: DefaultExtraData) => {
+ const constant: DefaultExtraDataDTO = ParameterMapper.defaultExtraDataToDTO(row);
+ res.push(constant.value);
+ });
+ });
+ console.log(res);
+ } else {
+ await DefaultExtraData.findAll({
+ where: {
+ parameterType: 'NAF Adultos',
+ order: {
+ [Op.gt]: 0,
+ },
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: DefaultExtraData[]) => {
+ rows.forEach((row: DefaultExtraData) => {
+ const constant: DefaultExtraDataDTO = ParameterMapper.defaultExtraDataToDTO(row);
+ res.push(constant.value);
+ });
+ });
+ }
+ break;
+ }
+ case AgeBracket.a30_59: {
+ if (sex === Sex.Female) {
+ await DefaultExtraData.findAll({
+ where: {
+ [Op.or]: [
+ { parameterType: 'NAF Adultos' },
+ {
+ id: ['pregnancyExtraEnergy30to59', 'lactationExtraEnergy30to59'],
+ },
+ ],
+ order: {
+ [Op.gt]: 0,
+ },
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: DefaultExtraData[]) => {
+ rows.forEach((row: DefaultExtraData) => {
+ const constant: DefaultExtraDataDTO = ParameterMapper.defaultExtraDataToDTO(row);
+ res.push(constant.value);
+ });
+ });
+ console.log(res);
+ } else {
+ await DefaultExtraData.findAll({
+ where: {
+ parameterType: 'NAF Adultos',
+ order: {
+ [Op.gt]: 0,
+ },
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: DefaultExtraData[]) => {
+ rows.forEach((row: DefaultExtraData) => {
+ const constant: DefaultExtraDataDTO = ParameterMapper.defaultExtraDataToDTO(row);
+ res.push(constant.value);
+ });
+ });
+ }
+ break;
+ }
+ case AgeBracket.a60: {
+ await DefaultExtraData.findAll({
+ where: {
+ parameterType: 'NAF Adultos',
+ order: {
+ [Op.gt]: 0,
+ },
+ },
+ order: [['order', 'ASC']],
+ })
+ .then((rows: DefaultExtraData[]) => {
+ rows.forEach((row: DefaultExtraData) => {
+ const constant: DefaultExtraDataDTO = ParameterMapper.defaultExtraDataToDTO(row);
+ res.push(constant.value);
+ });
+ });
break;
}
- case (AgeBracket.m5): {
- if (sex === Sex.Male) {
- // -152 + (92.8*MP) + 36
- res = [-152, 92.8, 36];
- } else if (sex === Sex.Female) {
- // -152 + (92.8*MP) + 47
- res = [-152, 92.8, 47];
- }
- break;
- }
- case (AgeBracket.m6): {
- if (sex === Sex.Male) {
- // -99.4 + (88.6*MP) + 17
- res = [-99.4, 88.6, 17];
- } else if (sex === Sex.Female) {
- // -99.4 + (88.6*MP) + 20
- res = [-99.4, 88.6, 20];
- }
- break;
- }
- case (AgeBracket.m7): {
- if (sex === Sex.Male) {
- // -99.4 + (88.6*MP) + 16
- res = [-99.4, 88.6, 16];
- } else if (sex === Sex.Female) {
- // -99.4 + (88.6*MP) + 17
- res = [-99.4, 88.6, 17];
- }
- break;
- }
- case (AgeBracket.m8): {
- if (sex === Sex.Male) {
- // -99.4 + (88.6*MP) + 14
- res = [-99.4, 88.6, 14];
- } else if (sex === Sex.Female) {
- // -99.4 + (88.6*MP) + 15
- res = [-99.4, 88.6, 15];
- }
- break;
- }
- case (AgeBracket.m9): {
- if (sex === Sex.Male) {
- // -99.4 + (88.6*MP) + 21
- res = [-99.4, 88.6, 21];
- } else if (sex === Sex.Female) {
- // -99.4 + (88.6*MP) + 18
- res = [-99.4, 88.6, 18];
- }
- break;
- }
- case (AgeBracket.m10): {
- if (sex === Sex.Male) {
- // -99.4 + (88.6*MP) + 21
- res = [-99.4, 88.6, 21];
- } else if (sex === Sex.Female) {
- // -99.4 + (88.6*MP) + 15
- res = [-99.4, 88.6, 15];
- }
- break;
- }
- case (AgeBracket.m11): {
- if (sex === Sex.Male) {
- // -99.4 + (88.6*MP) + 22
- res = [-99.4, 88.6, 22];
- } else if (sex === Sex.Female) {
- // -99.4 + (88.6*MP) + 14
- res = [-99.4, 88.6, 14];
- }
- break;
- }
- case (AgeBracket.a1): {
- if (sex === Sex.Male) {
- // 310.2 + (63.3*MP) - 0.263*MP^2 + 13
- res = [310.2, 63.3, -0.263, 13];
- } else if (sex === Sex.Female) {
- // 263.4 + (65.3*MP) - 0.454*MP^2 + 13
- res = [263.4, 65.3, -0.454, 13];
- }
- break;
- }
- case (AgeBracket.a2): {
- if (sex === Sex.Male) {
- // 310.2 + (63.3*MP) - 0.263*MP^2 + 12
- res = [310.2, 63.3, -0.263, 12];
- } else if (sex === Sex.Female) {
- // 263.4 + (65.3*MP) - 0.454*MP^2 + 13
- res = [263.4, 65.3, -0.454, 13];
- }
- break;
- }
- case (AgeBracket.a3): {
- if (sex === Sex.Male) {
- // 310.2 + (63.3*MP) - 0.263*MP^2 + 12
- res = [310.2, 63.3, -0.263, 12];
- } else if (sex === Sex.Female) {
- // 263.4 + (65.3*MP) - 0.454*MP^2 + 11
- res = [263.4, 65.3, -0.454, 11];
- }
- break;
- }
- case (AgeBracket.a4): {
- if (sex === Sex.Male) {
- // 310.2 + (63.3*MP) - 0.263*MP^2 + 11
- res = [310.2, 63.3, -0.263, 11];
- } else if (sex === Sex.Female) {
- // 263.4 + (65.3*MP) - 0.454*MP^2 + 10
- res = [263.4, 65.3, -0.454, 10];
- }
- break;
- }
- case (AgeBracket.a5): {
- if (sex === Sex.Male) {
- // 310.2 + (63.3*MP) - 0.263*MP^2 + 11
- res = [310.2, 63.3, -0.263, 11];
- } else if (sex === Sex.Female) {
- // 263.4 + (65.3*MP) - 0.454*MP^2 + 10
- res = [263.4, 65.3, -0.454, 10];
- }
- break;
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- 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];
- } 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];
- }
- break;
- }
- case (AgeBracket.a18_29): {
- if (sex === Sex.Male) {
- // (15.057*MP + 692.2) * PAL
- res = [15.057, 692.2, 1.95, 1.65, 1.85, 1.55];
- } else if (sex === Sex.Female) {
- // (14.818*MP + 486.6) * PAL, 208 and 251 extra energy for pregnant and lactating women
- res = [14.818, 486.6, 1.95, 1.65, 1.85, 1.55, 208, 251];
- }
- break;
- }
- case (AgeBracket.a30_59): {
- if (sex === Sex.Male) {
- // (11.472*MP + 873.1) * PAL
- res = [11.472, 873.1, 1.95, 1.65, 1.85, 1.55];
- } else if (sex === Sex.Female) {
- // (8.126*MP + 845.6) * PAL, 208 and 251 extra energy for pregnant and lactating women
- res = [8.126, 845.6, 1.95, 1.65, 1.85, 1.55, 208, 251];
- }
- break;
- }
- case (AgeBracket.a60): {
- if (sex === Sex.Male) {
- // (11.711*MP + 587.7) * PAL
- res = [11.711, 587.7, 1.95, 1.65, 1.85, 1.55];
- } else if (sex === Sex.Female) {
- // (9.082*MP + 658.5) * PAL
- res = [9.082, 658.5, 1.95, 1.65, 1.85, 1.55];
- }
- break;
- }
-
default: {
- throw new Error('Parsing error, attribute edad does not respect format');
+ break;
}
}
return res;
};
-// const getParametersOfType = async (paramType: ParameterType): Promise<ParameterDTO[]> => {
-// const res: ParameterDTO[] = [];
-// const estaChota = await Parameter.findAll({
-// where: {
-// parameterType: paramType,
-// },
-// })
-// .then((parameters) => parameters.forEach((param: Parameter) => {
-// res.push(ParameterMapper.parameterToData(param));
-// }))
-// .catch((err) => {
-// throw new Error(err);
-// });
-// return res;
+// const getParameters = async (): Promise<ParameterDTO[]> => {
+// const res: ParameterDTO[] = [];
+// await Parameter.findAll().then((parameters: Parameter[]) => {
+// parameters.forEach((param: Parameter) => {
+// res.push(ParameterMapper.parameterToData(param));
+// });
+// });
+// return res;
// };
-export default { getEquationValues, getParameters };
+export default { getEquationValues /* , getParameters */ };
+
+// const getEquationValues = (ageBracket: AgeBracket, sex: Sex): number[] => {
+// let res: number[] = [];
+// switch (ageBracket) {
+// case (AgeBracket.m0): {
+// if (sex === Sex.Male) {
+// // -152 + (92.8*MP) + 211
+// res = [-152, 92.8, 211];
+// } else if (sex === Sex.Female) {
+// // -152 + (92.8*MP) + 178
+// res = [-152, 92.8, 178];
+// }
+// break;
+// }
+// case (AgeBracket.m1): {
+// if (sex === Sex.Male) {
+// // -152 + (92.8*MP) + 183
+// res = [-152, 92.8, 183];
+// } else if (sex === Sex.Female) {
+// // -152 + (92.8*MP) + 161
+// res = [-152, 92.8, 161];
+// }
+// break;
+// }
+// case (AgeBracket.m2): {
+// if (sex === Sex.Male) {
+// // -152 + (92.8*MP) + 139
+// res = [-152, 92.8, 139];
+// } else if (sex === Sex.Female) {
+// // -152 + (92.8*MP) + 134
+// res = [-152, 92.8, 134];
+// }
+// break;
+// }
+// case (AgeBracket.m3): {
+// if (sex === Sex.Male) {
+// // -152 + (92.8*MP) + 53
+// res = [-152, 92.8, 53];
+// } else if (sex === Sex.Female) {
+// // -152 + (92.8*MP) + 68
+// res = [-152, 92.8, 68];
+// }
+// break;
+// }
+// case (AgeBracket.m4): {
+// if (sex === Sex.Male) {
+// // -152 + (92.8*MP) + 46
+// res = [-152, 92.8, 46];
+// } else if (sex === Sex.Female) {
+// // -152 + (92.8*MP) + 57
+// res = [-152, 92.8, 57];
+// }
+// break;
+// }
+// case (AgeBracket.m5): {
+// if (sex === Sex.Male) {
+// // -152 + (92.8*MP) + 36
+// res = [-152, 92.8, 36];
+// } else if (sex === Sex.Female) {
+// // -152 + (92.8*MP) + 47
+// res = [-152, 92.8, 47];
+// }
+// break;
+// }
+// case (AgeBracket.m6): {
+// if (sex === Sex.Male) {
+// // -99.4 + (88.6*MP) + 17
+// res = [-99.4, 88.6, 17];
+// } else if (sex === Sex.Female) {
+// // -99.4 + (88.6*MP) + 20
+// res = [-99.4, 88.6, 20];
+// }
+// break;
+// }
+// case (AgeBracket.m7): {
+// if (sex === Sex.Male) {
+// // -99.4 + (88.6*MP) + 16
+// res = [-99.4, 88.6, 16];
+// } else if (sex === Sex.Female) {
+// // -99.4 + (88.6*MP) + 17
+// res = [-99.4, 88.6, 17];
+// }
+// break;
+// }
+// case (AgeBracket.m8): {
+// if (sex === Sex.Male) {
+// // -99.4 + (88.6*MP) + 14
+// res = [-99.4, 88.6, 14];
+// } else if (sex === Sex.Female) {
+// // -99.4 + (88.6*MP) + 15
+// res = [-99.4, 88.6, 15];
+// }
+// break;
+// }
+// case (AgeBracket.m9): {
+// if (sex === Sex.Male) {
+// // -99.4 + (88.6*MP) + 21
+// res = [-99.4, 88.6, 21];
+// } else if (sex === Sex.Female) {
+// // -99.4 + (88.6*MP) + 18
+// res = [-99.4, 88.6, 18];
+// }
+// break;
+// }
+// case (AgeBracket.m10): {
+// if (sex === Sex.Male) {
+// // -99.4 + (88.6*MP) + 21
+// res = [-99.4, 88.6, 21];
+// } else if (sex === Sex.Female) {
+// // -99.4 + (88.6*MP) + 15
+// res = [-99.4, 88.6, 15];
+// }
+// break;
+// }
+// case (AgeBracket.m11): {
+// if (sex === Sex.Male) {
+// // -99.4 + (88.6*MP) + 22
+// res = [-99.4, 88.6, 22];
+// } else if (sex === Sex.Female) {
+// // -99.4 + (88.6*MP) + 14
+// res = [-99.4, 88.6, 14];
+// }
+// break;
+// }
+// case (AgeBracket.a1): {
+// if (sex === Sex.Male) {
+// // 310.2 + (63.3*MP) - 0.263*MP^2 + 13
+// res = [310.2, 63.3, -0.263, 13];
+// } else if (sex === Sex.Female) {
+// // 263.4 + (65.3*MP) - 0.454*MP^2 + 13
+// res = [263.4, 65.3, -0.454, 13];
+// }
+// break;
+// }
+// case (AgeBracket.a2): {
+// if (sex === Sex.Male) {
+// // 310.2 + (63.3*MP) - 0.263*MP^2 + 12
+// res = [310.2, 63.3, -0.263, 12];
+// } else if (sex === Sex.Female) {
+// // 263.4 + (65.3*MP) - 0.454*MP^2 + 13
+// res = [263.4, 65.3, -0.454, 13];
+// }
+// break;
+// }
+// case (AgeBracket.a3): {
+// if (sex === Sex.Male) {
+// // 310.2 + (63.3*MP) - 0.263*MP^2 + 12
+// res = [310.2, 63.3, -0.263, 12];
+// } else if (sex === Sex.Female) {
+// // 263.4 + (65.3*MP) - 0.454*MP^2 + 11
+// res = [263.4, 65.3, -0.454, 11];
+// }
+// break;
+// }
+// case (AgeBracket.a4): {
+// if (sex === Sex.Male) {
+// // 310.2 + (63.3*MP) - 0.263*MP^2 + 11
+// res = [310.2, 63.3, -0.263, 11];
+// } else if (sex === Sex.Female) {
+// // 263.4 + (65.3*MP) - 0.454*MP^2 + 10
+// res = [263.4, 65.3, -0.454, 10];
+// }
+// break;
+// }
+// case (AgeBracket.a5): {
+// if (sex === Sex.Male) {
+// // 310.2 + (63.3*MP) - 0.263*MP^2 + 11
+// res = [310.2, 63.3, -0.263, 11];
+// } else if (sex === Sex.Female) {
+// // 263.4 + (65.3*MP) - 0.454*MP^2 + 10
+// res = [263.4, 65.3, -0.454, 10];
+// }
+// break;
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// 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];
+// } 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];
+// }
+// break;
+// }
+// case (AgeBracket.a18_29): {
+// if (sex === Sex.Male) {
+// // (15.057*MP + 692.2) * PAL
+// res = [15.057, 692.2, 1.95, 1.65, 1.85, 1.55];
+// } else if (sex === Sex.Female) {
+// // (14.818*MP + 486.6) * PAL, 208 and 251 extra energy for pregnant and lactating women
+// res = [14.818, 486.6, 1.95, 1.65, 1.85, 1.55, 208, 251];
+// }
+// break;
+// }
+// case (AgeBracket.a30_59): {
+// if (sex === Sex.Male) {
+// // (11.472*MP + 873.1) * PAL
+// res = [11.472, 873.1, 1.95, 1.65, 1.85, 1.55];
+// } else if (sex === Sex.Female) {
+// // (8.126*MP + 845.6) * PAL, 208 and 251 extra energy for pregnant and lactating women
+// res = [8.126, 845.6, 1.95, 1.65, 1.85, 1.55, 208, 251];
+// }
+// break;
+// }
+// case (AgeBracket.a60): {
+// if (sex === Sex.Male) {
+// // (11.711*MP + 587.7) * PAL
+// res = [11.711, 587.7, 1.95, 1.65, 1.85, 1.55];
+// } else if (sex === Sex.Female) {
+// // (9.082*MP + 658.5) * PAL
+// res = [9.082, 658.5, 1.95, 1.65, 1.85, 1.55];
+// }
+// break;
+// }
+
+// default: {
+// throw new Error('Parsing error, attribute edad does not respect format');
+// }
+// }
+// return res;
+// };