From 2e48d14d1b07512e867436d6a1e5b34d973fcdbe Mon Sep 17 00:00:00 2001 From: Eugene Dvoretsky Date: Mon, 17 Feb 2020 17:56:08 +0300 Subject: [PATCH] Full nutrition content calculations --- heval/nutrition.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/heval/nutrition.py b/heval/nutrition.py index b2f2049..a0653bf 100644 --- a/heval/nutrition.py +++ b/heval/nutrition.py @@ -364,14 +364,14 @@ def describe_dose(self, vol_24h): rate_1h = vol_24h / 24 top_rate_1h = self.max_1h_rate * self.human_model.weight info += "Daily dose {:.0f} ml/24h ({:.0f} kcal/24h) at rate {:.0f}-{:.0f} ml/h:\n".format(vol_24h, kcal_24h, rate_1h, top_rate_1h) - info += " * Proteins {:>5.1f} g/24h ({:>4.2f}-{:>4.2f} g/kg/h)\n".format(self.c_prt * vol_24h, self.c_prt * rate_1h / self.human_model.weight, self.c_prt * top_rate_1h / self.human_model.weight) - info += " * Lipids {:>5.1f} g/24h ({:>4.2f}-{:>4.2f} g/kg/h)\n".format(self.c_lip * vol_24h, self.c_lip * rate_1h / self.human_model.weight, self.c_lip * top_rate_1h / self.human_model.weight) - info += " * Glusose {:>5.1f} g/24h ({:>4.2f}-{:>4.2f} g/kg/h)\n".format(self.c_glu * vol_24h, self.c_glu * rate_1h / self.human_model.weight, self.c_glu * top_rate_1h / self.human_model.weight) + info += " * Proteins {:>5.1f} g/24h, {:.1f} g/kg/24h ({:>4.2f}-{:>4.2f} g/kg/h)\n".format(self.c_prt * vol_24h, self.c_prt * vol_24h / self.human_model.weight, self.c_prt * rate_1h / self.human_model.weight, self.c_prt * top_rate_1h / self.human_model.weight) + info += " * Lipids {:>5.1f} g/24h, {:.1f} g/kg/24h ({:>4.2f}-{:>4.2f} g/kg/h)\n".format(self.c_lip * vol_24h, self.c_lip * vol_24h / self.human_model.weight, self.c_lip * rate_1h / self.human_model.weight, self.c_lip * top_rate_1h / self.human_model.weight) + info += " * Glusose {:>5.1f} g/24h, {:.1f} g/kg/24h ({:>4.2f}-{:>4.2f} g/kg/h)\n".format(self.c_glu * vol_24h, self.c_glu * vol_24h / self.human_model.weight, self.c_glu * rate_1h / self.human_model.weight, self.c_glu * top_rate_1h / self.human_model.weight) else: info += "Daily dose {:.0f} ml/24h ({:.0f} kcal/24h)\n".format(vol_24h, kcal_24h) - info += " * Proteins {:>5.1f} g/24h\n".format(self.c_prt * vol_24h) - info += " * Lipids {:>5.1f} g/24h\n".format(self.c_lip * vol_24h) - info += " * Glusose {:>5.1f} g/24h\n".format(self.c_glu * vol_24h) + info += " * Proteins {:>5.1f} g/24h, {:.1f} g/kg/24h\n".format(self.c_prt * vol_24h, self.c_prt * vol_24h / self.human_model.weight) + info += " * Lipids {:>5.1f} g/24h, {:.1f} g/kg/24h\n".format(self.c_lip * vol_24h, self.c_lip * vol_24h / self.human_model.weight) + info += " * Glusose {:>5.1f} g/24h, {:.1f} g/kg/24h\n".format(self.c_glu * vol_24h, self.c_glu * vol_24h / self.human_model.weight) return info