Update app.py

app.py

@@ -1,14 +1,14 @@
 import streamlit as st
 
 # Function to calculate calories burned during swimming
-def calories_swim(time_hr, weight_kg):
-    METS = 10  # Metabolic Equivalent for swimming
-    return (time_hr * METS * 3.5 * weight_kg) / 200
+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 pull-ups
-def calories_pullup(weight, reps):
-    # 1 calorie per 2.20462 pounds lifted per meter (estimated)
-    calories_per_pullup = (weight * 0.453592) * 2 / 2.20462
+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
 
 # Streamlit UI
@@ -20,7 +20,7 @@ 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
-reps = st.sidebar.slider("Number of Pull-Ups", 0, 500, 400)
+reps = st.sidebar.slider("Number of Pull-Ups", 0, 500, 200)
 
 st.sidebar.subheader("Choose Exercise Type 🤸‍♂️")
 exercise_type = st.sidebar.selectbox(
@@ -28,22 +28,35 @@ 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
+}
+
+ring_style_factors = {
+    "Standard 🌟": 1.0,
+    "Mixed Grip ✨": 1.1,
+    "Wide Grip 🌠": 1.2
+}
+
 st.sidebar.subheader("Choose Swim Style 🌊")
 swim_style = st.sidebar.selectbox(
     "",
-    ["Frog Kick 🐸", "Dolphin Kick 🐬", "Butterfly 🦋"]
+    list(swim_style_factors.keys())
 )
 
 st.sidebar.subheader("Choose Ring Style 🪐")
 ring_style = st.sidebar.selectbox(
     "",
-    ["Standard 🌟", "Mixed Grip ✨", "Wide Grip 🌠"]
+    list(ring_style_factors.keys())
 )
 
 # Calculation
 weight_kg = weight * 0.453592
-calories_from_swimming = calories_swim(time_swim, weight_kg)
-calories_from_pullups = calories_pullup(weight, reps)
+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])
 
 # Display
 st.subheader(f"Calories Burned 🔥")