Update data/ashrae_tables.py

data/ashrae_tables.py

@@ -114,27 +114,12 @@ class ASHRAETables:
         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, color: str, is_wall: bool = True) -> Tuple[bool, str]:
-        """
-        Validate inputs for CLTD calculations.
-        
-        Args:
-            group (str): Wall or roof group (e.g., 'A', 'B').
-            orientation (str): Orientation (e.g., 'North', 'Horizontal').
-            hour (int): Hour of the day (0-23).
-            latitude (str): Latitude (e.g., '24N').
-            month (str): Month (e.g., 'Jul').
-            color (str): Surface color ('Dark', 'Medium', 'Light').
-            is_wall (bool): True if validating for walls, False for roofs.
-        
-        Returns:
-            Tuple[bool, str]: (is_valid, error_message).
-        """
+    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."""
         valid_groups = [e.value for e in WallGroup] if is_wall else [e.value for e in RoofGroup]
         valid_orientations = [e.value for e in Orientation]
-        valid_latitudes = ['24N', '32N', '36N', '44N', '56N']
+        valid_latitudes = ['24N', '32N', '40N', '48N', '56N']
         valid_months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-        valid_colors = ['Dark', 'Medium', 'Light']
     
         if group not in valid_groups:
             return False, f"Invalid {'wall' if is_wall else 'roof'} group: {group}. Valid groups: {valid_groups}"
@@ -142,12 +127,53 @@ class ASHRAETables:
             return False, f"Invalid orientation: {orientation}. Valid orientations: {valid_orientations}"
         if hour not in range(24):
             return False, "Hour must be between 0 and 23."
+            
+        # Handle numeric latitude values and ensure comprehensive mapping
+        if latitude not in valid_latitudes:
+            # Try to convert numeric latitude to standard format
+            try:
+                # First, handle string representations that might contain direction indicators
+                if isinstance(latitude, str):
+                    # Extract numeric part, removing 'N' or 'S'
+                    lat_str = latitude.upper().strip()
+                    num_part = ''.join(c for c in lat_str if c.isdigit() or c == '.')
+                    lat_val = float(num_part)
+                    
+                    # Adjust for southern hemisphere if needed
+                    if 'S' in lat_str:
+                        lat_val = -lat_val
+                else:
+                    # Handle direct numeric input
+                    lat_val = float(latitude)
+                
+                # Take absolute value for mapping purposes
+                abs_lat = abs(lat_val)
+                
+                # Map to the closest standard latitude
+                if abs_lat < 28:
+                    mapped_latitude = '24N'
+                elif abs_lat < 36:
+                    mapped_latitude = '32N'
+                elif abs_lat < 44:
+                    mapped_latitude = '40N'
+                elif abs_lat < 52:
+                    mapped_latitude = '48N'
+                else:
+                    mapped_latitude = '56N'
+                
+                # Use the mapped latitude for validation
+                latitude = mapped_latitude
+                
+            except (ValueError, TypeError):
+                return False, f"Invalid latitude: {latitude}. Valid latitudes: {valid_latitudes}"
+                
         if latitude not in valid_latitudes:
             return False, f"Invalid latitude: {latitude}. Valid latitudes: {valid_latitudes}"
+            
         if month not in valid_months:
             return False, f"Invalid month: {month}. Valid months: {valid_months}"
-        if color not in valid_colors:
-            return False, f"Invalid color: {color}. Valid colors: {valid_colors}"
+        if not 0.0 <= solar_absorptivity <= 1.0:
+            return False, f"Invalid solar absorptivity: {solar_absorptivity}. Must be between 0.0 and 1.0."
         return True, "Valid inputs."
 
     def interpolate_cltd(self, latitude: float, cltd_table_low: pd.DataFrame, cltd_table_high: pd.DataFrame, lat_low: float, lat_high: float) -> pd.DataFrame: