Update data/building_components.py

data/building_components.py

@@ -93,7 +93,7 @@ class BuildingComponent:
     u_value: float  # W/(m²·K)
     area: float  # m²
     orientation: Orientation = Orientation.NOT_APPLICABLE
-    color: str = "Medium"  # Light, Medium, Dark
+    solar_absorptivity: float = 0.6  # Solar absorptivity (0-1), default Medium
     material_layers: List[MaterialLayer] = field(default_factory=list)
     
     def __post_init__(self):
@@ -102,6 +102,13 @@ class BuildingComponent:
             raise ValueError("Area must be greater than zero")
         if self.u_value < 0:
             raise ValueError("U-value cannot be negative")
+        # Enforce solar_absorptivity to be one of the five allowed values
+        valid_absorptivities = [0.3, 0.45, 0.6, 0.75, 0.9]
+        if not 0 <= self.solar_absorptivity <= 1:
+            raise ValueError("Solar absorptivity must be between 0 and 1")
+        if self.solar_absorptivity not in valid_absorptivities:
+            # Find the closest valid value
+            self.solar_absorptivity = min(valid_absorptivities, key=lambda x: abs(x - self.solar_absorptivity))
     
     @property
     def r_value(self) -> float:
@@ -152,7 +159,7 @@ class BuildingComponent:
             "u_value": self.u_value,
             "area": self.area,
             "orientation": self.orientation.value,
-            "color": self.color,
+            "solar_absorptivity": self.solar_absorptivity,
             "r_value": self.r_value,
             "material_layers": [layer.to_dict() for layer in self.material_layers],
             "calculated_u_value": self.calculated_u_value,
@@ -532,6 +539,23 @@ class BuildingComponentFactory:
         if isinstance(component_type, str):
             component_type = ComponentType[component_type]
         
+        # Handle legacy 'color' field for backward compatibility
+        if "color" in component_data and "solar_absorptivity" not in component_data:
+            color_map = {
+                "Light": 0.3,           # Maps to Light
+                "Light to Medium": 0.45,  # Maps to Light to Medium
+                "Light-Medium": 0.45,   # Alternative spelling for legacy data
+                "Medium": 0.6,          # Maps to Medium
+                "Medium to Dark": 0.75,   # Maps to Medium to Dark
+                "Medium-Dark": 0.75,    # Alternative spelling for legacy data
+                "Dark": 0.9            # Maps to Dark
+            }
+            # Use the mapped value or default to 0.6 (Medium) for unrecognized colors
+            color = component_data["color"]
+            component_data["solar_absorptivity"] = color_map.get(color, 0.6)
+            if color not in color_map:
+                print(f"Warning: Unrecognized legacy color '{color}' in component data. Defaulting to solar_absorptivity = 0.6 (Medium).")
+        
         # Handle drapery for Window components
         if component_type == ComponentType.WINDOW:
             drapery_data = component_data.pop("drapery", None)