Update data/calculation.py

data/calculation.py

@@ -13,6 +13,7 @@ from data.material_library import Construction, GlazingMaterial, DoorMaterial
 from data.internal_loads import PEOPLE_ACTIVITY_LEVELS, DIVERSITY_FACTORS, LIGHTING_FIXTURE_TYPES, EQUIPMENT_HEAT_GAINS, VENTILATION_RATES, INFILTRATION_SETTINGS
 import scipy.linalg as linalg
 from datetime import datetime
+from collections import defaultdict
 
 class ComponentType(Enum):
     WALL = "Wall"
@@ -137,8 +138,6 @@ class TFMCalculations:
     @staticmethod
     def get_adaptive_comfort_temp(outdoor_temp: float) -> float:
         """Calculate adaptive comfort temperature per ASHRAE 55."""
-        # Simplified ASHRAE 55 adaptive model: T_comf = 0.31 * T_out + 17.8
-        # Valid for 10°C ≤ T_out ≤ 33.5°C
         if 10 <= outdoor_temp <= 33.5:
             return 0.31 * outdoor_temp + 17.8
         return 24.0  # Default to standard setpoint if outside range
@@ -171,7 +170,6 @@ class TFMCalculations:
     def get_indoor_conditions(indoor_conditions: Dict, hour: int, outdoor_temp: float) -> Dict:
         """Determine indoor conditions based on user settings."""
         if indoor_conditions["type"] == "Fixed":
-            # Select cooling or heating setpoint based on outdoor temperature
             mode = "none" if abs(outdoor_temp - 18) < 0.01 else "cooling" if outdoor_temp > 18 else "heating"
             if mode == "cooling":
                 return {
@@ -183,7 +181,7 @@ class TFMCalculations:
                     "temperature": indoor_conditions.get("heating_setpoint", {}).get("temperature", 22.0),
                     "rh": indoor_conditions.get("heating_setpoint", {}).get("rh", 50.0)
                 }
-            else:  # mode == "none"
+            else:
                 return {"temperature": 24.0, "rh": 50.0}
         elif indoor_conditions["type"] == "Time-varying":
             schedule = indoor_conditions.get("schedule", [])
@@ -200,7 +198,7 @@ class TFMCalculations:
     def calculate_tfm_loads(components: Dict, hourly_data: List[Dict], indoor_conditions: Dict, internal_loads: Dict, building_info: Dict, sim_period: Dict, hvac_settings: Dict) -> List[Dict]:
         """Calculate TFM loads for heating and cooling with user-defined filters and temperature threshold."""
         filtered_data = TFMCalculations.filter_hourly_data(hourly_data, sim_period, building_info)
-        loads = []
+        temp_loads = []
         building_orientation = building_info.get("orientation_angle", 0.0)
         operating_periods = hvac_settings.get("operating_hours", [{"start": 8, "end": 18}])
         area = building_info.get("floor_area", 100.0)
@@ -243,14 +241,15 @@ class TFMCalculations:
             # Calculate total loads, subtracting internal load for heating
             total_cooling = conduction_cooling + solar + internal + ventilation_cooling + infiltration_cooling
             total_heating = max(conduction_heating + ventilation_heating + infiltration_heating - internal, 0)
-            # Enforce mutual exclusivity
+            # Enforce mutual exclusivity within hour
             if mode == "cooling":
                 total_heating = 0
             elif mode == "heating":
                 total_cooling = 0
-            loads.append({
+            temp_loads.append({
                 "hour": hour,
                 "month": hour_data["month"],
+                "day": hour_data["day"],
                 "conduction_cooling": conduction_cooling,
                 "conduction_heating": conduction_heating,
                 "solar": solar,
@@ -262,4 +261,24 @@ class TFMCalculations:
                 "total_cooling": total_cooling,
                 "total_heating": total_heating
             })
-        return loads
+        # Group loads by day and apply daily control
+        loads_by_day = defaultdict(list)
+        for load in temp_loads:
+            day_key = (load["month"], load["day"])
+            loads_by_day[day_key].append(load)
+        final_loads = []
+        for day_key, day_loads in loads_by_day.items():
+            # Count hours with non-zero cooling and heating loads
+            cooling_hours = sum(1 for load in day_loads if load["total_cooling"] > 0)
+            heating_hours = sum(1 for load in day_loads if load["total_heating"] > 0)
+            # Apply daily control
+            for load in day_loads:
+                if cooling_hours > heating_hours:
+                    load["total_heating"] = 0  # Keep cooling components, zero heating total
+                elif heating_hours > cooling_hours:
+                    load["total_cooling"] = 0  # Keep heating components, zero cooling total
+                else:  # Equal hours
+                    load["total_cooling"] = 0
+                    load["total_heating"] = 0  # Zero both totals, keep components
+                final_loads.append(load)
+        return final_loads