test5

app.py

@@ -42,17 +42,6 @@ def calculate_lighting_consumption(occupancy_1br: float, occupancy_2br: float) -
     ) * 6  # 6 hours per day
 
 
-def calculate_appliance_consumption(
-    occupancy_1br: float, occupancy_2br: float
-) -> float:
-    """Calculate daily appliance consumption"""
-    return (
-        occupancy_1br * ONE_BR_UNITS * (250 - (LIGHTS_1BR * LIGHT_POWER * 6 / 1000))
-    ) + (
-        occupancy_2br * TWO_BR_UNITS * (400 - (LIGHTS_2BR * LIGHT_POWER * 6 / 1000))
-    )  # Daily kWh
-
-
 def total_consumption(
     occupancy_1br: float, occupancy_2br: float, common_area: float
 ) -> float:
@@ -75,7 +64,9 @@ def battery_storage(batteries: int) -> float:
     return batteries * BATTERY_CAPACITY * BATTERY_VOLTAGE * 0.8 / 1000  # kWh
 
 
-def financial_analysis(consumption: float, production: float, storage: float) -> Dict:
+def financial_analysis(
+    consumption: float, common_area: float, production: float, storage: float
+) -> Dict:
     """Detailed financial calculations"""
     solar_used = min(production, consumption)
     surplus = max(0, production - consumption)
@@ -89,7 +80,7 @@ def financial_analysis(consumption: float, production: float, storage: float) ->
         grid_purchased -= grid_offset
 
     monthly_savings = (
-        (consumption * st.session_state.grid_price / 100)
+        ((consumption - common_area) * st.session_state.grid_price / 100)
         - (grid_purchased * st.session_state.grid_price / 100)
         + feed_in_revenue
     )
@@ -269,7 +260,9 @@ def main():
         consumption = total_consumption(params["1br"], params["2br"], params["common"])
         production = solar_production(st.session_state.solar_panels)
         storage = battery_storage(st.session_state.batteries)
-        financials = financial_analysis(consumption, production, storage)
+        financials = financial_analysis(
+            consumption, common_area_consumption * 30, production, storage
+        )
         analysis_data.append({"Scenario": name, **financials})
 
     df = pd.DataFrame(analysis_data)