Update data/building_components.py

data/building_components.py

@@ -7,30 +7,31 @@ from dataclasses import dataclass, field
 from enum import Enum
 from typing import List, Dict, Optional, Union
 import numpy as np
+from data.drapery import Drapery
 
 
 class Orientation(Enum):
     """Enumeration for building component orientations."""
-    NORTH = "North"
-    NORTHEAST = "Northeast"
-    EAST = "East"
-    SOUTHEAST = "Southeast"
-    SOUTH = "South"
-    SOUTHWEST = "Southwest"
-    WEST = "West"
-    NORTHWEST = "Northwest"
-    HORIZONTAL = "Horizontal"  # For roofs and floors
+    NORTH = "NORTH"
+    NORTHEAST = "NORTHEAST"
+    EAST = "EAST"
+    SOUTHEAST = "SOUTHEAST"
+    SOUTH = "SOUTH"
+    SOUTHWEST = "SOUTHWEST"
+    WEST = "WEST"
+    NORTHWEST = "NORTHWEST"
+    HORIZONTAL = "HORIZONTAL"  # For roofs and floors
     NOT_APPLICABLE = "N/A"  # For components without orientation
 
 
 class ComponentType(Enum):
     """Enumeration for building component types."""
-    WALL = "Wall"
-    ROOF = "Roof"
-    FLOOR = "Floor"
-    WINDOW = "Window"
-    DOOR = "Door"
-    SKYLIGHT = "Skylight"
+    WALL = "WALL"
+    ROOF = "ROOF"
+    FLOOR = "FLOOR"
+    WINDOW = "WINDOW"
+    DOOR = "DOOR"
+    SKYLIGHT = "SKYLIGHT"
 
 
 class MaterialLayer:
@@ -162,6 +163,8 @@ class BuildingComponent:
 class Wall(BuildingComponent):
     """Class representing a wall component."""
     
+    VALID_WALL_GROUPS = {"A", "B", "C", "D", "E", "F", "G", "H"}  # ASHRAE wall groups for CLTD
+    
     has_sun_exposure: bool = True
     wall_type: str = "Custom"  # Brick, Concrete, Wood Frame, etc.
     wall_group: str = "A"  # ASHRAE wall group (A, B, C, D, E, F, G, H)
@@ -175,6 +178,10 @@ class Wall(BuildingComponent):
         super().__post_init__()
         self.component_type = ComponentType.WALL
         
+        # Validate wall_group
+        if self.wall_group not in self.VALID_WALL_GROUPS:
+            raise ValueError(f"Invalid wall_group: {self.wall_group}. Must be one of {self.VALID_WALL_GROUPS}")
+        
         # Set net area equal to area if not specified
         if self.net_area is None:
             self.net_area = self.area
@@ -219,8 +226,10 @@ class Wall(BuildingComponent):
 class Roof(BuildingComponent):
     """Class representing a roof component."""
     
+    VALID_ROOF_GROUPS = {"1", "2", "3", "4", "5", "6", "7", "8"}  # ASHRAE roof groups for CLTD
+    
     roof_type: str = "Custom"  # Flat, Pitched, etc.
-    roof_group: str = "A"  # ASHRAE roof group
+    roof_group: str = "1"  # ASHRAE roof group
     pitch: float = 0.0  # Roof pitch in degrees
     has_suspended_ceiling: bool = False
     ceiling_plenum_height: float = 0.0  # m
@@ -230,6 +239,10 @@ class Roof(BuildingComponent):
         super().__post_init__()
         self.component_type = ComponentType.ROOF
         self.orientation = Orientation.HORIZONTAL
+        
+        # Validate roof_group
+        if self.roof_group not in self.VALID_ROOF_GROUPS:
+            raise ValueError(f"Invalid roof_group: {self.roof_group}. Must be one of {self.VALID_ROOF_GROUPS}")
     
     def to_dict(self) -> Dict:
         """Convert the roof to a dictionary."""
@@ -324,6 +337,7 @@ class Window(Fenestration):
     width: float = 1.0  # m
     height: float = 1.0  # m
     wall_id: str = None  # ID of the wall containing this window
+    drapery: Optional[Drapery] = None  # Drapery object
     
     def __post_init__(self):
         """Initialize window-specific attributes."""
@@ -333,6 +347,64 @@ class Window(Fenestration):
         # Calculate area from width and height if not provided
         if self.area <= 0 and self.width > 0 and self.height > 0:
             self.area = self.width * self.height
+        
+        # Initialize drapery if not provided
+        if self.drapery is None:
+            self.drapery = Drapery(enabled=False)
+    
+    @classmethod
+    def from_classification(cls, id: str, name: str, u_value: float, area: float, 
+                           shgc: float, orientation: Orientation, wall_id: str,
+                           drapery_classification: str, fullness: float = 1.0, **kwargs) -> 'Window':
+        """
+        Create window object with drapery from ASHRAE classification.
+        
+        Args:
+            id: Unique identifier
+            name: Window name
+            u_value: Window U-value in W/m²K
+            area: Window area in m²
+            shgc: Solar Heat Gain Coefficient (0-1)
+            orientation: Window orientation
+            wall_id: ID of the wall containing this window
+            drapery_classification: ASHRAE drapery classification (e.g., ID, IM, IIL)
+            fullness: Fullness factor (0-2)
+            **kwargs: Additional arguments for Window attributes
+            
+        Returns:
+            Window object
+        """
+        drapery = Drapery.from_classification(drapery_classification, fullness)
+        return cls(
+            id=id,
+            name=name,
+            component_type=ComponentType.WINDOW,
+            u_value=u_value,
+            area=area,
+            shgc=shgc,
+            orientation=orientation,
+            drapery=drapery,
+            wall_id=wall_id,
+            **kwargs
+        )
+    
+    def get_effective_u_value(self) -> float:
+        """Get effective U-value with drapery adjustment."""
+        if self.drapery and self.drapery.enabled:
+            return self.drapery.calculate_u_value_adjustment(self.u_value)
+        return self.u_value
+    
+    def get_shading_coefficient(self) -> float:
+        """Get shading coefficient with drapery."""
+        if self.drapery and self.drapery.enabled:
+            return self.drapery.calculate_shading_coefficient(self.shgc)
+        return self.shading_coefficient
+    
+    def get_iac(self) -> float:
+        """Get Interior Attenuation Coefficient with drapery."""
+        if self.drapery and self.drapery.enabled:
+            return self.drapery.calculate_iac(self.shgc)
+        return 1.0  # No attenuation
     
     def to_dict(self) -> Dict:
         """Convert the window to a dictionary."""
@@ -344,7 +416,9 @@ class Window(Fenestration):
             "low_e_coating": self.low_e_coating,
             "width": self.width,
             "height": self.height,
-            "wall_id": self.wall_id
+            "wall_id": self.wall_id,
+            "drapery": self.drapery.to_dict() if self.drapery else None,
+            "drapery_classification": self.drapery.get_classification() if self.drapery and self.drapery.enabled else None
         })
         return window_dict
 
@@ -449,17 +523,41 @@ class BuildingComponentFactory:
         """
         component_type = component_data.get("component_type")
         
-        if component_type == ComponentType.WALL.value:
+        # Convert string component_type to ComponentType enum
+        if isinstance(component_type, str):
+            component_type = ComponentType[component_type]
+        
+        # Handle drapery for Window components
+        if component_type == ComponentType.WINDOW:
+            drapery_data = component_data.pop("drapery", None)
+            drapery_classification = component_data.pop("drapery_classification", None)
+            if drapery_classification:
+                fullness = drapery_data.get("fullness", 1.0) if drapery_data else 1.0
+                component_data["drapery"] = Drapery.from_classification(drapery_classification, fullness)
+            elif drapery_data:
+                component_data["drapery"] = Drapery.from_dict(drapery_data)
+        
+        # Convert orientation to Orientation enum
+        if "orientation" in component_data and isinstance(component_data["orientation"], str):
+            component_data["orientation"] = Orientation[component_data["orientation"]]
+        
+        # Convert material_layers to MaterialLayer objects
+        if "material_layers" in component_data:
+            component_data["material_layers"] = [
+                MaterialLayer(**layer) for layer in component_data["material_layers"]
+            ]
+        
+        if component_type == ComponentType.WALL:
             return Wall(**component_data)
-        elif component_type == ComponentType.ROOF.value:
+        elif component_type == ComponentType.ROOF:
             return Roof(**component_data)
-        elif component_type == ComponentType.FLOOR.value:
+        elif component_type == ComponentType.FLOOR:
             return Floor(**component_data)
-        elif component_type == ComponentType.WINDOW.value:
+        elif component_type == ComponentType.WINDOW:
             return Window(**component_data)
-        elif component_type == ComponentType.DOOR.value:
+        elif component_type == ComponentType.DOOR:
             return Door(**component_data)
-        elif component_type == ComponentType.SKYLIGHT.value:
+        elif component_type == ComponentType.SKYLIGHT:
             return Skylight(**component_data)
         else:
-            raise ValueError(f"Unknown component type: {component_type}")
+            raise ValueError(f"Unknown component type: {component_type}")