Update data/ashrae_tables.py

data/ashrae_tables.py

@@ -15,7 +15,6 @@ ENHANCEMENTS:
 """
 
 from typing import Dict, List, Any, Optional, Tuple
-import logging
 import pandas as pd
 import numpy as np
 import os
@@ -93,34 +92,25 @@ class EquipmentType(Enum):
 class ASHRAETables:
     """Class for managing ASHRAE tables for load calculations, compliant with ASHRAE Handbook—Fundamentals (2017, Chapter 18)."""
     
-    def __init__(self):
-        """
-        Initialize ASHRAE tables with CLTD, SCL, CLF, heat gain, and correction factors.
-        Includes logging for debugging.
-        """
-        logger.info("Initializing ASHRAETables")
-        try:
-            # Load tables
-            self.cltd_wall = self._load_cltd_wall_table()
-            self.cltd_roof = self._load_cltd_roof_table()
-            self.scl = self._load_scl_table()
-            self.clf_lights = self._load_clf_lights_table()
-            self.clf_people = self._load_clf_people_table()
-            self.clf_equipment = self._load_clf_equipment_table()
-            self.heat_gain = self._load_heat_gain_table()
-            self.occupancy_heat_gain = self._load_occupancy_heat_gain_table()
-            self.equipment_heat_gain = self._load_equipment_heat_gain_table()
-            # Load correction factors
-            self.latitude_correction = self._load_latitude_correction()
-            self.color_correction = self._load_color_correction()
-            self.month_correction = self._load_month_correction()
-            # Load thermal properties and roof classifications
-            self.thermal_properties = self._load_thermal_properties()
-            self.roof_classifications = self._load_roof_classifications()
-            logger.info("ASHRAETables initialized successfully")
-        except Exception as e:
-            logger.error(f"Error initializing ASHRAETables: {str(e)}")
-            raise
+    def__init__(self):
+        """Initialize ASHRAE tables with CLTD, SCL, CLF, heat gain, and correction factors."""
+        # Load tables
+        self.cltd_wall = self._load_cltd_wall_table()
+        self.cltd_roof = self._load_cltd_roof_table()
+        self.scl = self._load_scl_table()
+        self.clf_lights = self._load_clf_lights_table()
+        self.clf_people = self._load_clf_people_table()
+        self.clf_equipment = self._load_clf_equipment_table()
+        self.heat_gain = self._load_heat_gain_table()
+        self.occupancy_heat_gain = self._load_occupancy_heat_gain_table()
+        self.equipment_heat_gain = self._load_equipment_heat_gain_table()
+        # Load correction factors
+        self.latitude_correction = self._load_latitude_correction()
+        self.color_correction = self._load_color_correction()
+        self.month_correction = self._load_month_correction()
+        # Load thermal properties and roof classifications
+        self.thermal_properties = self._load_thermal_properties()
+        self.roof_classifications = self._load_roof_classifications()
 
     def _validate_cltd_inputs(self, group: str, orientation: str, hour: int, latitude: str, month: str, solar_absorptivity: float, is_wall: bool = True) -> Tuple[bool, str]:
         """Validate inputs for CLTD calculations."""
@@ -197,14 +187,13 @@ class ASHRAETables:
             0.9: 1.15    # Dark surfaces
         }
     
-    def _load_latitude_correction(self) -> pd.DataFrame:
+    def_load_latitude_correction(self) -> pd.DataFrame:
         """
         Load latitude correction factors for CLTD based on ASHRAE Handbook—Fundamentals (2017, Chapter 18, Table 7).
         
         Returns:
             pd.DataFrame: DataFrame with columns 'latitude' (degrees N), 'correction_factor' (dimensionless).
         """
-        logger.info("Loading latitude correction table")
         try:
             # Simplified correction factors for CLTD (dimensionless, applied to wall/roof conduction)
             # Values are approximate, based on ASHRAE Table 7 for typical wall/roof types
@@ -216,11 +205,9 @@ class ASHRAETables:
                 {'latitude': 56, 'correction_factor': 0.92}
             ]
             df = pd.DataFrame(data)
-            logger.info(f"Latitude correction table loaded: {df.shape[0]} rows")
             return df
         except Exception as e:
-            logger.error(f"Error loading latitude correction table: {str(e)}")
-            raise
+            raise Exception(f"Error loading latitude correction table: {str(e)}")
     
     def _load_occupancy_heat_gain_table(self) -> pd.DataFrame:
         """
@@ -348,8 +335,7 @@ class ASHRAETables:
                 raise ValueError(f"No data found for source: {source}, subcategory: {subcategory}")
             return float(row['sensible'].iloc[0]), float(row['latent'].iloc[0])
         except Exception as e:
-            logger.error(f"Error in get_heat_gain: {str(e)}")
-            raise
+            raise ValueError(f"Error in get_heat_gain: {str(e)}")
     
     def interpolate_cltd(self, latitude: float, cltd_table_low: pd.DataFrame, cltd_table_high: pd.DataFrame, lat_low: float, lat_high: float) -> pd.DataFrame:
         """