Update app.py

app.py

@@ -1,15 +1,13 @@
 import streamlit as st
 
-# Function to calculate calories burned during swimming
-def calories_swim(time_hr, weight_kg, style_factor):
-    METS = 10  # Base Metabolic Equivalent for swimming
-    return (time_hr * (METS * style_factor) * 3.5 * weight_kg) / 200
+# Function to calculate calories burned during swimming based on swim style
+def calories_swim(time_hr, weight_kg, style_mets):
+    return (time_hr * style_mets * 3.5 * weight_kg) / 200
 
-# Function to calculate calories burned during pull-ups
-def calories_pullup(weight, reps, style_factor):
-    # Lifting full body weight per pull-up, adjusted by style
-    calories_per_pullup = weight * style_factor / 350
-    return calories_per_pullup * reps
+# Function to calculate calories burned during pull-ups based on grip style
+def calories_pullup(reps, weight, grip_style_factor):
+    # Using formula PUC = (PU * 5 * BW / 150) * grip_style_factor
+    return (reps * 5 * weight) / 150 * grip_style_factor
 
 # Streamlit UI
 st.title("Calories Burned Calculator 🏊‍♂️💪")
@@ -19,24 +17,30 @@ st.sidebar.header("Input Parameters 🛠️")
 time_swim = st.sidebar.slider("Swimming Time (hours)", 0.0, 5.0, 2.0)
 weight = st.sidebar.number_input("Your weight (lbs)", 100, 300, 175)
 
-# Ring Exercise parameters
+# Pull-Up parameters
 reps = st.sidebar.slider("Number of Pull-Ups", 0, 500, 200)
 
+# Choose Exercise Type
 st.sidebar.subheader("Choose Exercise Type 🤸‍♂️")
 exercise_type = st.sidebar.selectbox(
     "",
     ["Swim Jim 🏊‍♂️", "Ring King 👑", "Both Boost 🚀"]
 )
 
-# Style factor adjustments
-swim_style_factors = {
-    "Frog Kick 🐸": 1.0,
-    "Dolphin Kick 🐬": 1.1,
-    "Butterfly 🦋": 1.2
+# Swim Styles with METs
+swim_styles = {
+    "Treading Water 🌊": 3.5,
+    "Backstroke 🏊‍♂️": 4.8,
+    "Breaststroke 🐸": 5.3,
+    "Freestyle Light 🦋": 5.8,
+    "Freestyle Vigorous 🚀": 8.3,
+    "Butterfly 🦋": 7.5,
+    "Dog Paddle 🐶": 4.0
 }
 
-ring_style_factors = {
-    "Standard 🌟": 1.0,
+# Grip Styles with factors
+grip_styles = {
+    "Standard 🌟": 1,
     "Mixed Grip ✨": 1.1,
     "Wide Grip 🌠": 1.2
 }
@@ -44,21 +48,21 @@ ring_style_factors = {
 st.sidebar.subheader("Choose Swim Style 🌊")
 swim_style = st.sidebar.selectbox(
     "",
-    list(swim_style_factors.keys())
+    list(swim_styles.keys())
 )
 
 st.sidebar.subheader("Choose Ring Style 🪐")
-ring_style = st.sidebar.selectbox(
+grip_style = st.sidebar.selectbox(
     "",
-    list(ring_style_factors.keys())
+    list(grip_styles.keys())
 )
 
 # Calculation
 weight_kg = weight * 0.453592
-calories_from_swimming = calories_swim(time_swim, weight_kg, swim_style_factors[swim_style])
-calories_from_pullups = calories_pullup(weight, reps, ring_style_factors[ring_style])
+calories_from_swimming = calories_swim(time_swim, weight_kg, swim_styles[swim_style])
+calories_from_pullups = calories_pullup(reps, weight, grip_styles[grip_style])
 
-# Display
+# Display Results
 st.subheader(f"Calories Burned 🔥")
 if exercise_type == "Swim Jim 🏊‍♂️":
     st.write(f"Calories burned from swimming: {calories_from_swimming:.2f}")
@@ -77,7 +81,7 @@ else:
     st.write("Doing both exercises works almost all major muscle groups!")
 
 st.subheader(f"Swim Style: {swim_style} 🌊")
-st.write("Various swim styles focus on different muscle groups.")
+st.write(f"METS for chosen style: {swim_styles[swim_style]}")
 
-st.subheader(f"Ring Style: {ring_style} 🪐")
-st.write("Different grip styles can emphasize different muscle groups.")
+st.subheader(f"Ring Style: {grip_style} 🪐")
+st.write(f"Factor for chosen grip: {grip_styles[grip_style]}")