From 2f7546bb454880b8332bf38cef64a8309be80018 Mon Sep 17 00:00:00 2001
From: Jacob <jra457@msstate.edu>
Date: Sun, 7 Apr 2024 23:46:07 -0500
Subject: [PATCH] Fixed implementation to support flask and pytest along with
 cache

---
 .../__pycache__/bmiCalculator.cpython-310.pyc | Bin 1552 -> 1787 bytes
 ...bmiCalculator.cpython-310-pytest-6.2.5.pyc | Bin 2203 -> 2215 bytes
 code/bmiCalculator.py                         |  18 ++++++++++++++----
 code/test_bmiCalculator.py                    |  16 ++++++++--------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/code/__pycache__/bmiCalculator.cpython-310.pyc b/code/__pycache__/bmiCalculator.cpython-310.pyc
index 4ae34c4ad962fe563b8d8961a54dd4955147d885..8a058a0875d32d72a13a4414e927a4e4de3b746b 100644
GIT binary patch
delta 657
zcmYLGL2J}N6rT4oNoJExy4~znUAGo06oLmmDhLXDR6Mwzf)Li7sY+WHW|u8OmLAd{
zV9BwF7cX7}@#2s0;x#`+kb?MLWZM_sH}9KydGDJyAKDjDJd2`0kR30R{iSyn58?Fe
z&fQFhx_v4#Pe(eY)i+9S9H4z{TDnsL2;-F^1LG5-aSa$O@g-(K7E;Eh33T^d>coWS
z;-lnz-5WQa_P>4p1Sd!x9r6+RyhE@Mg(zVG1(a}8jKvptmZEj(#I^`htl_wZHx_uO
z0ZCEqzdCxGFDHjXB6BX<0UOaW<&?GYK6}&bAqDyYte_AY4}=Z0Lotl0zm~+i+P&l+
z@qzaLbFFx-zT$Jg5s+flb9PTcQZSk<%<GwbzeBa>*9jylM}k!9522?n2&Mch(e~(Y
z%39XOx40a{fCvwQhJY)iVPFX>r@+G5$1zEzV;TzIuPKyD8*VUZGjth}>X)1J9ny4<
z=-eX+K!HNr|DHQr0Qak<ybaq`?hMgxRX^mD@EZTfs_l&`cK5=k9NuEssUEp6M(x_q
zb3L2p`PF+|iLian+-}kdYL(~jCP#*n`8I1+Ki$1uE-8gls-*(us7;D`DpBas7vlis
F?|&6TaYq0E

delta 439
zcmY+9&q_i;6vpSw%)QR_U;eon=*6Hyy0kD_wU7wf6|}K7B1kb~g=jPiZIl-G1(Kna
zM9&cRH1`!+M}!caaU&i0ejGkN<~y^<Jg2kwnM{)4><^3GFK3z!U^LyUpDI_TdQ=~(
zgiJ>OMDd8UKsiXNm;yy3+NLeh@-UH6LS|=Nt|@OuUb)T7Tyv=~|Nij?PaGQ<>I5}x
zBSvIQA{fCKBB+oFl`vsrDrt{sUoyLoS(i2mdK|r~bpClRdb={Q@}yYpp?4mWo9=QB
zj^otjz-+Q3Kcw2hX6+$D9>Ze{w??w9kX`rh0()2)kpm8bp@jHBx?+Lk{8vz2m^XL{
zpl+JZHk3_+2UHi$i*uIp?Yrw1CG+XjQudp=ViB0Yy?~^7aQ&TvHEf5rZL#Qd23LL6
i>F5pX<t*}M?$)X{!wFvCiKHkB9|bOTX_l5L|Na9PxK_jf

diff --git a/code/__pycache__/test_bmiCalculator.cpython-310-pytest-6.2.5.pyc b/code/__pycache__/test_bmiCalculator.cpython-310-pytest-6.2.5.pyc
index 3e5860ac14b28a366200994879053a1cc9e0ee60..6992533ba74c5bfba4ab585330bd1292ac3f2d09 100644
GIT binary patch
delta 90
zcmbO&xLlAgpO=@50SNw=3a4>#Pvra0!Jd?x8DEx|vssXF5sL~>NosLPJXA;<sIZs^
bNEk62u^2Iduo+90^khY55xA~btQ(mCDJ~bL

delta 93
zcmZ23I9re}pO=@50SKIeh0|VfP2~H}!km<wxmlEP5sNuTNosLPJdmpmR8Y(VB#fAi
iSd5rJ*o>u0JOn81oS2hbnv+<PU!(_9z4;sKMkWA7LmBu0

diff --git a/code/bmiCalculator.py b/code/bmiCalculator.py
index 0d87f75..306711e 100644
--- a/code/bmiCalculator.py
+++ b/code/bmiCalculator.py
@@ -25,8 +25,11 @@ def height(inH):
 
 
 # Calculate bmi
-def bmi(w, h):
-  bmiVal = weight(w) / height(h)
+def bmi_val(w, h):
+   return (weight(w) / height(h))
+
+def bmiCategory(bmiVal):
+
   category = ""
 
   #if (bmiVal < 18.5):
@@ -39,8 +42,14 @@ def bmi(w, h):
   else:
     category = "Obese"
 
-  return bmiVal, category
+  return category
+
+
+def bmi(w, h):
+   bmiVal = bmi_val(w, h)
+   category = bmiCategory(bmiVal)
 
+   return bmiVal, category
 
 
 # Get weight
@@ -83,7 +92,8 @@ def inputHeight():
 
 
 
-if __name__ == "__main__":  
+if __name__ == "__main__":
+  
   print("BMI Calculator for Adults (20+ Years Old)")
 
   weight = inputWeight()
diff --git a/code/test_bmiCalculator.py b/code/test_bmiCalculator.py
index 8ec0776..0ad0655 100644
--- a/code/test_bmiCalculator.py
+++ b/code/test_bmiCalculator.py
@@ -6,7 +6,7 @@
 """
 import unittest
 import numpy as np
-from bmiCalculator import weight, height, bmi, bmiCategory
+from bmiCalculator import weight, height, bmi_val, bmiCategory
 
 # Average male height: 5'9" = 69"
 
@@ -40,26 +40,26 @@ def test_height(self):
 
 
 
-  def test_bmi(self):
+  def test_bmi_val(self):
     # ~ Underweight Boundary Test
     # Test at weight = 122.1, height = 69"
-    self.assertEqual(bmi(122.1, 69), np.divide(np.multiply(122.1, 0.45), np.power(np.multiply(69, 0.025), 2)))
+    self.assertEqual(bmi_val(122.1, 69), np.divide(np.multiply(122.1, 0.45), np.power(np.multiply(69, 0.025), 2)))
 
     # ~ Healthy Weight Boundary Test
     # Test at weight = 122.4, height = 69"
-    self.assertEqual(bmi(122.4, 69), np.divide(np.multiply(122.4, 0.45), np.power(np.multiply(69, 0.025), 2)))
+    self.assertEqual(bmi_val(122.4, 69), np.divide(np.multiply(122.4, 0.45), np.power(np.multiply(69, 0.025), 2)))
     # Test at weight = 164.6, height = 69"
-    self.assertEqual(bmi(164.6, 69), np.divide(np.multiply(164.6, 0.45), np.power(np.multiply(69, 0.025), 2)))
+    self.assertEqual(bmi_val(164.6, 69), np.divide(np.multiply(164.6, 0.45), np.power(np.multiply(69, 0.025), 2)))
 
     # ~ Overweight Boundary Test
     # Test at weight = 164.7, height = 69"
-    self.assertEqual(bmi(164.7, 69), np.divide(np.multiply(164.7, 0.45), np.power(np.multiply(69, 0.025), 2)))
+    self.assertEqual(bmi_val(164.7, 69), np.divide(np.multiply(164.7, 0.45), np.power(np.multiply(69, 0.025), 2)))
     # Test at weight = 197.7, height = 69"
-    self.assertEqual(bmi(197.7, 69), np.divide(np.multiply(197.7, 0.45), np.power(np.multiply(69, 0.025), 2)))
+    self.assertEqual(bmi_val(197.7, 69), np.divide(np.multiply(197.7, 0.45), np.power(np.multiply(69, 0.025), 2)))
 
     # ~ Obese Boundary Test
     # Test at weight = 197.8, height = 69"
-    self.assertEqual(bmi(197.8, 69), np.divide(np.multiply(197.8, 0.45), np.power(np.multiply(69, 0.025), 2)))
+    self.assertEqual(bmi_val(197.8, 69), np.divide(np.multiply(197.8, 0.45), np.power(np.multiply(69, 0.025), 2)))