Upload material_library.py

data/material_library.py

@@ -1,20 +1,9 @@
 """
 Material Library for HVAC Load Calculator
-Updated 2025-05-28: Consolidated door materials into main materials library, prefixed with 'D'.
-                 Updated references to solar_absorption to solar_absorptance.
-                 Renamed 'conductivity' to 'U-value' with units W/m²·K in Material class.
-                 Added thermal properties to door materials to align with Material class.
-                 Removed DoorMaterial class and library_door_materials.
-Updated 2025-05-27: Renamed solar_absorption to solar_absorptance, moved door materials to materials with 'D' prefix,
-                 renamed conductivity to U-value (W/m²·K), and integrated door thermal properties into Material class.
-Updated 2025-05-26: Added emissivity to Material, h_o to GlazingMaterial, and expanded DoorMaterial to include all Material
-                 properties plus emissivity. Assigned values based on provided data and inferred for doors.
-Updated 2025-05-17: Removed original materials and constructions, deleted ASHRAE materials starting with 'R' followed by number
-                 (e.g., R01, R25), verified constructions use valid materials.
-Updated 2025-05-17: Added all materials and constructions from ASHRAE_2005_HOF_Materials.idf with Australian-specific
-                 embodied carbon and prices.
-Updated 2025-05-17: Added GlazingMaterial and DoorMaterial classes, included library_glazing_materials and
-                 library_door_materials with comprehensive data.
+Updated 2025-05-26: Added emissivity to Material, h_o to GlazingMaterial, and expanded DoorMaterial to include all Material properties plus emissivity. Assigned values based on provided data and inferred for doors.
+Updated 2025-05-17: Removed original materials and constructions, deleted ASHRAE materials starting with 'R' followed by number (e.g., R01, R25), verified constructions use valid materials.
+Updated 2025-05-17: Added all materials and constructions from ASHRAE_2005_HOF_Materials.idf with Australian-specific embodied carbon and prices.
+Updated 2025-05-17: Added GlazingMaterial and DoorMaterial classes, included library_glazing_materials and library_door_materials with comprehensive data.
 Updated 2025-05-16: Removed mass_per_meter, added thermal_mass method, updated CSV handling.
 Updated 2025-05-16: Fixed U-value calculation in Material.get_u_value.
 Updated 2025-05-16: Updated MaterialCategory to Finishing Materials, Structural Materials, Sub-Structural Materials, Insulation.
@@ -33,7 +22,6 @@ class MaterialCategory(Enum):
     STRUCTURAL_MATERIALS = "Structural Materials"
     SUB_STRUCTURAL_MATERIALS = "Sub-Structural Materials"
     INSULATION = "Insulation"
-    DOOR_MATERIALS = "Door Materials" # Keep this category for classification purposes within Material class
 
 class ThermalMass(Enum):
     HIGH = "High"
@@ -42,25 +30,22 @@ class ThermalMass(Enum):
     NO_MASS = "No Mass"
 
 class Material:
-    def __init__(self, name: str, category: MaterialCategory, u_value: float, density: float,
+    def __init__(self, name: str, category: MaterialCategory, conductivity: float, density: float,
                  specific_heat: float, default_thickness: float, embodied_carbon: float,
-                 solar_absorptance: float, price: float, emissivity: float, is_library: bool = True):
+                 solar_absorption: float, price: float, emissivity: float, is_library: bool = True):
         self.name = name
         self.category = category
-        # u_value here represents the thermal conductivity (k) of the material in W/m·K.
-        # The method get_u_value() then calculates the overall U-value (U = k/L) for a given thickness.
-        self.u_value = max(0.01, u_value)  # W/m·K (formerly conductivity, now named u_value for clarity)
+        self.conductivity = max(0.01, conductivity)  # W/m·K
         self.density = max(1.0, density)  # kg/m³
         self.specific_heat = max(100.0, specific_heat)  # J/kg·K
         self.default_thickness = max(0.01, default_thickness)  # m
         self.embodied_carbon = max(0.0, embodied_carbon)  # kgCO₂e/kg
-        self.solar_absorptance = min(max(0.0, solar_absorptance), 1.0) # Dimensionless
-        self.price = max(0.0, price)  # USD/m² (price per square meter of material at default thickness)
+        self.solar_absorption = min(max(0.0, solar_absorption), 1.0)
+        self.price = max(0.0, price)  # USD/m²
         self.emissivity = min(max(0.0, emissivity), 1.0)  # Dimensionless
         self.is_library = is_library
 
     def get_thermal_mass(self) -> ThermalMass:
-        # This method calculates the thermal mass category based on density and specific heat.
         if self.density < 100.0 or self.specific_heat < 800.0:
             return ThermalMass.NO_MASS
         elif self.density > 2000.0 and self.specific_heat > 800.0:
@@ -71,58 +56,63 @@ class Material:
             return ThermalMass.LOW
 
     def get_u_value(self) -> float:
-        # This method calculates the U-value (overall heat transfer coefficient) for a layer
-        # of this material based on its conductivity (self.u_value) and default thickness.
-        return self.u_value / self.default_thickness if self.default_thickness > 0 else 0.1 # U = k/L
+        return self.conductivity / self.default_thickness if self.default_thickness > 0 else 0.1
 
 class GlazingMaterial:
     def __init__(self, name: str, u_value: float, shgc: float, embodied_carbon: float, price: float, h_o: float, is_library: bool = True):
         self.name = name
-        self.u_value = max(0.1, u_value)  # W/m²·K (overall U-value for glazing)
-        self.shgc = min(max(0.0, shgc), 1.0)  # Solar Heat Gain Coefficient (dimensionless)
+        self.u_value = max(0.1, u_value)  # W/m²·K
+        self.shgc = min(max(0.0, shgc), 1.0)  # Solar Heat Gain Coefficient
         self.embodied_carbon = max(0.0, embodied_carbon)  # kgCO₂e/m²
         self.price = max(0.0, price)  # USD/m²
         self.h_o = max(0.0, h_o)  # W/m²·K, exterior convective heat transfer coefficient
         self.is_library = is_library
 
+class DoorMaterial:
+    def __init__(self, name: str, category: MaterialCategory, conductivity: float, density: float,
+                 specific_heat: float, default_thickness: float, u_value: float, solar_absorption: float,
+                 embodied_carbon: float, price: float, emissivity: float, is_library: bool = True):
+        self.name = name
+        self.category = category
+        self.conductivity = max(0.01, conductivity)  # W/m·K
+        self.density = max(1.0, density)  # kg/m³
+        self.specific_heat = max(100.0, specific_heat)  # J/kg·K
+        self.default_thickness = max(0.01, default_thickness)  # m
+        self.u_value = max(0.1, u_value)  # W/m²·K
+        self.solar_absorption = min(max(0.0, solar_absorption), 1.0)
+        self.embodied_carbon = max(0.0, embodied_carbon)  # kgCO₂e/m²
+        self.price = max(0.0, price)  # USD/m²
+        self.emissivity = min(max(0.0, emissivity), 1.0)  # Dimensionless
+        self.is_library = is_library
+
 class Construction:
     def __init__(self, name: str, component_type: str, layers: List[Dict], is_library: bool = True):
         self.name = name
         self.component_type = component_type
         self.layers = layers or []
         self.is_library = is_library
-        # Calculate U-value, total thickness, embodied carbon, solar absorptance, and price for the construction
         self.u_value = self.calculate_u_value()
         self.total_thickness = sum(layer["thickness"] for layer in self.layers)
-        # Embodied carbon for construction is sum of (material embodied carbon per kg * material density * layer thickness)
         self.embodied_carbon = sum(layer["material"].embodied_carbon * layer["material"].density * layer["thickness"]
                                   for layer in self.layers)
-        # Solar absorptance for construction is typically determined by the outermost layer.
-        # Here, it takes the maximum of all layers, assuming the highest absorptance dominates.
-        self.solar_absorptance = max(layer["material"].solar_absorptance for layer in self.layers) if self.layers else 0.6
-        # Price for construction is sum of (material price per m² * layer thickness / material default thickness)
+        self.solar_absorption = max(layer["material"].solar_absorption for layer in self.layers) if self.layers else 0.6
         self.price = sum(layer["material"].price * layer["thickness"] / layer["material"].default_thickness
                          for layer in self.layers)
 
     def calculate_u_value(self) -> float:
-        # Calculates the overall U-value for the construction based on the sum of thermal resistances of its layers.
         if not self.layers:
-            return 0.1 # Default U-value if no layers
-        # Sum of thermal resistances (R = L/k) for each layer
-        r_total = sum(layer["thickness"] / layer["material"].u_value for layer in self.layers) # layer["material"].u_value is conductivity (k)
-        return 1 / r_total if r_total > 0 else 0.1 # U = 1/R_total
+            return 0.1
+        r_total = sum(layer["thickness"] / layer["material"].conductivity for layer in self.layers)
+        return 1 / r_total if r_total > 0 else 0.1
 
     def get_thermal_mass(self) -> ThermalMass:
-        # Determines the thermal mass category of the entire construction.
         if not self.layers:
             return ThermalMass.NO_MASS
         total_thickness = self.total_thickness
         if total_thickness == 0:
             return ThermalMass.NO_MASS
-        # Calculate average density and specific heat for the construction
         avg_density = sum(layer["material"].density * layer["thickness"] for layer in self.layers) / total_thickness
         avg_specific_heat = sum(layer["material"].specific_heat * layer["thickness"] for layer in self.layers) / total_thickness
-        
         if avg_density < 100.0 or avg_specific_heat < 800.0:
             return ThermalMass.NO_MASS
         elif avg_density > 2000.0 and avg_specific_heat > 800.0:
@@ -137,6 +127,7 @@ class MaterialLibrary:
         self.library_materials = self.initialize_materials()
         self.library_constructions = self.initialize_constructions()
         self.library_glazing_materials = self.initialize_glazing_materials()
+        self.library_door_materials = self.initialize_door_materials()
 
     def initialize_materials(self) -> Dict[str, Material]:
         materials = [
@@ -171,257 +162,309 @@ class MaterialLibrary:
             Material("M03 150mm brick", MaterialCategory.STRUCTURAL_MATERIALS, 0.89, 1920.0, 790.0, 0.1524, 0.3, 0.7, 29.3, 0.93),
             Material("M04 200mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 0.51, 800.0, 920.0, 0.2032, 0.2, 0.65, 13.0, 0.925),
             Material("M05 200mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 1.11, 1280.0, 920.0, 0.2032, 0.2, 0.65, 20.8, 0.925),
-            Material("M06 200mm lightweight concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.2032, 0.2, 0.6, 10.4, 0.925),
-            Material("M07 200mm concrete block (filled)", MaterialCategory.STRUCTURAL_MATERIALS, 0.84, 1600.0, 920.0, 0.2032, 0.2, 0.65, 26.0, 0.925),
-            Material("M08 100mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 0.51, 800.0, 920.0, 0.1016, 0.2, 0.65, 6.5, 0.925),
-            Material("M09 100mm concrete block (filled)", MaterialCategory.STRUCTURAL_MATERIALS, 0.84, 1600.0, 920.0, 0.1016, 0.2, 0.65, 13.0, 0.925),
-            Material("M10 100mm lightweight concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.1016, 0.2, 0.6, 5.2, 0.925),
-            Material("M11 50mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.0508, 0.15, 0.6, 10.0, 0.90),
-            Material("M12 75mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.0762, 0.15, 0.6, 15.0, 0.90),
-            Material("M13 100mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.1016, 0.15, 0.6, 20.0, 0.90),
-            Material("M14 150mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.1524, 0.15, 0.6, 30.0, 0.90),
-            Material("M15 200mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.2032, 0.15, 0.6, 40.0, 0.90),
-            Material("M16 250mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.254, 0.15, 0.6, 50.0, 0.90),
-            Material("M17 300mm concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 1.73, 2240.0, 840.0, 0.3048, 0.15, 0.6, 60.0, 0.90),
-            Material("M18 50mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.0508, 0.1, 0.5, 3.0, 0.925),
-            Material("M19 75mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.0762, 0.1, 0.5, 4.5, 0.925),
-            Material("M20 100mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.1016, 0.1, 0.5, 6.0, 0.925),
-            Material("M21 150mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.1524, 0.1, 0.5, 9.0, 0.925),
-            Material("M22 200mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.2032, 0.1, 0.5, 12.0, 0.925),
-            Material("M23 250mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.254, 0.1, 0.5, 15.0, 0.925),
-            Material("M24 300mm lightweight concrete slab", MaterialCategory.STRUCTURAL_MATERIALS, 0.19, 640.0, 920.0, 0.3048, 0.1, 0.5, 18.0, 0.925),
-            Material("M25 100mm concrete slab (heavy)", MaterialCategory.STRUCTURAL_MATERIALS, 2.0, 2400.0, 900.0, 0.1016, 0.18, 0.6, 22.0, 0.90),
-            Material("M26 150mm concrete slab (heavy)", MaterialCategory.STRUCTURAL_MATERIALS, 2.0, 2400.0, 900.0, 0.1524, 0.18, 0.6, 33.0, 0.90),
-            Material("M27 200mm concrete slab (heavy)", MaterialCategory.STRUCTURAL_MATERIALS, 2.0, 2400.0, 900.0, 0.2032, 0.18, 0.6, 44.0, 0.90),
-            Material("M28 250mm concrete slab (heavy)", MaterialCategory.STRUCTURAL_MATERIALS, 2.0, 2400.0, 900.0, 0.254, 0.18, 0.6, 55.0, 0.90),
-            Material("M29 300mm concrete slab (heavy)", MaterialCategory.STRUCTURAL_MATERIALS, 2.0, 2400.0, 900.0, 0.3048, 0.18, 0.6, 66.0, 0.90),
-            Material("P01 13mm plywood", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 540.0, 1210.0, 0.0127, 0.2, 0.5, 6.5, 0.90),
-            Material("P02 19mm plywood", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 540.0, 1210.0, 0.0191, 0.2, 0.5, 9.7, 0.90),
-            Material("P03 25mm plywood", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 540.0, 1210.0, 0.0254, 0.2, 0.5, 13.0, 0.90),
-            Material("P04 13mm particle board", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 640.0, 1300.0, 0.0127, 0.2, 0.5, 5.5, 0.90),
-            Material("P05 19mm particle board", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 640.0, 1300.0, 0.0191, 0.2, 0.5, 8.3, 0.90),
-            Material("P06 25mm particle board", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 640.0, 1300.0, 0.0254, 0.2, 0.5, 11.0, 0.90),
-            Material("P07 13mm hardboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 960.0, 1300.0, 0.0127, 0.2, 0.5, 7.0, 0.90),
-            Material("P08 19mm hardboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 960.0, 1300.0, 0.0191, 0.2, 0.5, 10.5, 0.90),
-            Material("P09 25mm hardboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 960.0, 1300.0, 0.0254, 0.2, 0.5, 14.0, 0.90),
-            Material("P10 13mm fibreboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.04, 240.0, 1300.0, 0.0127, 0.2, 0.5, 3.0, 0.90),
-            Material("P11 19mm fibreboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.04, 240.0, 1300.0, 0.0191, 0.2, 0.5, 4.5, 0.90),
-            Material("P12 25mm fibreboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.04, 240.0, 1300.0, 0.0254, 0.2, 0.5, 6.0, 0.90),
-            Material("S01 13mm stucco", MaterialCategory.FINISHING_MATERIALS, 0.72, 1856.0, 840.0, 0.0127, 0.2, 0.6, 7.1, 0.91),
-            Material("S02 25mm stucco", MaterialCategory.FINISHING_MATERIALS, 0.72, 1856.0, 840.0, 0.0254, 0.2, 0.6, 14.1, 0.91),
-            Material("S03 13mm plaster", MaterialCategory.FINISHING_MATERIALS, 0.72, 1600.0, 840.0, 0.0127, 0.2, 0.5, 6.1, 0.90),
-            Material("S04 25mm plaster", MaterialCategory.FINISHING_MATERIALS, 0.72, 1600.0, 840.0, 0.0254, 0.2, 0.5, 12.2, 0.90),
-            Material("S05 13mm gypsum plaster", MaterialCategory.FINISHING_MATERIALS, 0.16, 800.0, 1090.0, 0.0127, 0.25, 0.4, 5.1, 0.925),
-            Material("S06 25mm gypsum plaster", MaterialCategory.FINISHING_MATERIALS, 0.16, 800.0, 1090.0, 0.0254, 0.25, 0.4, 10.2, 0.925),
-            Material("S07 13mm wood siding", MaterialCategory.FINISHING_MATERIALS, 0.14, 500.0, 1600.0, 0.0127, 0.25, 0.5, 8.0, 0.90),
-            Material("S08 19mm wood siding", MaterialCategory.FINISHING_MATERIALS, 0.14, 500.0, 1600.0, 0.0191, 0.25, 0.5, 12.0, 0.90),
-            Material("S09 25mm wood siding", MaterialCategory.FINISHING_MATERIALS, 0.14, 500.0, 1600.0, 0.0254, 0.25, 0.5, 16.0, 0.90),
-            Material("S10 13mm brick veneer", MaterialCategory.FINISHING_MATERIALS, 0.89, 1920.0, 790.0, 0.0127, 0.3, 0.7, 2.4, 0.93),
-            Material("S11 25mm brick veneer", MaterialCategory.FINISHING_MATERIALS, 0.89, 1920.0, 790.0, 0.0254, 0.3, 0.7, 4.8, 0.93),
-            Material("S12 50mm brick veneer", MaterialCategory.FINISHING_MATERIALS, 0.89, 1920.0, 790.0, 0.0508, 0.3, 0.7, 9.6, 0.93),
-            Material("S13 13mm concrete siding", MaterialCategory.FINISHING_MATERIALS, 0.72, 1856.0, 840.0, 0.0127, 0.2, 0.6, 7.1, 0.91),
-            Material("S14 25mm concrete siding", MaterialCategory.FINISHING_MATERIALS, 0.72, 1856.0, 840.0, 0.0254, 0.2, 0.6, 14.1, 0.91),
-            Material("S15 13mm asphalt shingle", MaterialCategory.FINISHING_MATERIALS, 0.06, 1120.0, 920.0, 0.0127, 0.5, 0.9, 10.0, 0.90),
-            Material("S16 25mm asphalt shingle", MaterialCategory.FINISHING_MATERIALS, 0.06, 1120.0, 920.0, 0.0254, 0.5, 0.9, 20.0, 0.90),
-            Material("T01 13mm ceramic tile", MaterialCategory.FINISHING_MATERIALS, 1.0, 2200.0, 880.0, 0.0127, 0.4, 0.6, 15.0, 0.90),
-            Material("T02 25mm ceramic tile", MaterialCategory.FINISHING_MATERIALS, 1.0, 2200.0, 880.0, 0.0254, 0.4, 0.6, 30.0, 0.90),
-            Material("T03 13mm vinyl tile", MaterialCategory.FINISHING_MATERIALS, 0.17, 1600.0, 1200.0, 0.0032, 0.1, 0.5, 4.0, 0.90),
-            Material("T04 25mm vinyl tile", MaterialCategory.FINISHING_MATERIALS, 0.17, 1600.0, 1200.0, 0.0064, 0.1, 0.5, 8.0, 0.90),
-            Material("T05 13mm carpet", MaterialCategory.FINISHING_MATERIALS, 0.06, 100.0, 1300.0, 0.0127, 0.8, 0.7, 25.0, 0.90),
-            Material("T06 25mm carpet", MaterialCategory.FINISHING_MATERIALS, 0.06, 100.0, 1300.0, 0.0254, 0.8, 0.7, 50.0, 0.90),
-            Material("W01 13mm wood", MaterialCategory.FINISHING_MATERIALS, 0.15, 608.0, 1630.0, 0.0127, 0.3, 0.5, 7.7, 0.925),
-            Material("W02 19mm wood", MaterialCategory.FINISHING_MATERIALS, 0.15, 608.0, 1630.0, 0.0191, 0.3, 0.5, 11.6, 0.925),
-            Material("W03 25mm wood", MaterialCategory.FINISHING_MATERIALS, 0.15, 608.0, 1630.0, 0.0254, 0.3, 0.5, 15.4, 0.925),
-            Material("W04 13mm wood fiberboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.04, 240.0, 1300.0, 0.0127, 0.2, 0.5, 3.0, 0.90),
-            Material("W05 19mm wood fiberboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.04, 240.0, 1300.0, 0.0191, 0.2, 0.5, 4.5, 0.90),
-            Material("W06 25mm wood fiberboard", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.04, 240.0, 1300.0, 0.0254, 0.2, 0.5, 6.0, 0.90),
-            Material("W07 13mm wood sheathing", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 540.0, 1210.0, 0.0127, 0.2, 0.5, 6.5, 0.90),
-            Material("W08 19mm wood sheathing", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 540.0, 1210.0, 0.0191, 0.2, 0.5, 9.7, 0.90),
-            Material("W09 25mm wood sheathing", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.12, 540.0, 1210.0, 0.0254, 0.2, 0.5, 13.0, 0.90),
-            Material("W10 13mm wood paneling", MaterialCategory.FINISHING_MATERIALS, 0.15, 608.0, 1630.0, 0.0127, 0.3, 0.5, 7.7, 0.925),
-            Material("W11 19mm wood paneling", MaterialCategory.FINISHING_MATERIALS, 0.15, 608.0, 1630.0, 0.0191, 0.3, 0.5, 11.6, 0.925),
-            Material("W12 25mm wood paneling", MaterialCategory.FINISHING_MATERIALS, 0.15, 608.0, 1630.0, 0.0254, 0.3, 0.5, 15.4, 0.925),
-            Material("Z99 Other", MaterialCategory.FINISHING_MATERIALS, 0.1, 100.0, 1000.0, 0.01, 0.1, 0.5, 1.0, 0.9),
-
-            # Door Materials (moved from separate section, prefixed with 'D')
-            Material("D01 Wood Door - Solid Core", MaterialCategory.DOOR_MATERIALS, 0.14, 700.0, 1700.0, 0.045, 0.25, 0.5, 80.0, 0.90),
-            Material("D02 Wood Door - Hollow Core", MaterialCategory.DOOR_MATERIALS, 0.08, 200.0, 1500.0, 0.035, 0.15, 0.5, 50.0, 0.90),
-            Material("D03 Steel Door - Insulated", MaterialCategory.DOOR_MATERIALS, 45.0, 7850.0, 500.0, 0.045, 2.0, 0.7, 120.0, 0.15),
-            Material("D04 Steel Door - Non-insulated", MaterialCategory.DOOR_MATERIALS, 45.0, 7850.0, 500.0, 0.035, 1.8, 0.7, 90.0, 0.15),
-            Material("D05 Fiberglass Door", MaterialCategory.DOOR_MATERIALS, 0.04, 150.0, 1200.0, 0.045, 0.3, 0.6, 100.0, 0.85),
-            Material("D06 Aluminum Door - Insulated", MaterialCategory.DOOR_MATERIALS, 205.0, 2700.0, 900.0, 0.045, 1.5, 0.8, 150.0, 0.05),
-            Material("D07 Aluminum Door - Non-insulated", MaterialCategory.DOOR_MATERIALS, 205.0, 2700.0, 900.0, 0.035, 1.2, 0.8, 110.0, 0.05),
-            Material("D08 Glass Door - Single Pane", MaterialCategory.DOOR_MATERIALS, 1.0, 2500.0, 750.0, 0.006, 0.5, 0.1, 70.0, 0.84),
-            Material("D09 Glass Door - Double Pane", MaterialCategory.DOOR_MATERIALS, 1.0, 2500.0, 750.0, 0.012, 1.0, 0.1, 140.0, 0.84),
-            Material("D10 PVC Door", MaterialCategory.DOOR_MATERIALS, 0.17, 1400.0, 1000.0, 0.04, 0.4, 0.5, 75.0, 0.90),
-            Material("D11 Composite Door", MaterialCategory.DOOR_MATERIALS, 0.06, 300.0, 1300.0, 0.045, 0.35, 0.6, 95.0, 0.88),
-            Material("D12 Plywood Door", MaterialCategory.DOOR_MATERIALS, 0.12, 540.0, 1210.0, 0.0254, 0.2, 0.5, 13.0, 0.90), # Reusing P03
-            Material("D13 Particle Board Door", MaterialCategory.DOOR_MATERIALS, 0.12, 640.0, 1300.0, 0.0254, 0.2, 0.5, 11.0, 0.90), # Reusing P06
-            Material("D14 Hardboard Door", MaterialCategory.DOOR_MATERIALS, 0.12, 960.0, 1300.0, 0.0254, 0.2, 0.5, 14.0, 0.90), # Reusing P09
-            Material("D15 Fibreboard Door", MaterialCategory.DOOR_MATERIALS, 0.04, 240.0, 1300.0, 0.0254, 0.2, 0.5, 6.0, 0.90), # Reusing P12
+            Material("M06 150mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 0.51, 800.0, 920.0, 0.1524, 0.2, 0.65, 9.8, 0.925),
+            Material("M07 100mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 0.51, 800.0, 920.0, 0.1016, 0.2, 0.65, 6.5, 0.925),
+            Material("M08 150mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 1.11, 1280.0, 920.0, 0.1524, 0.2, 0.65, 15.6, 0.925),
+            Material("M09 100mm concrete block", MaterialCategory.STRUCTURAL_MATERIALS, 1.11, 1280.0, 920.0, 0.1016, 0.2, 0.65, 10.4, 0.925),
+            Material("M10 100mm lightweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 0.53, 1280.0, 840.0, 0.1016, 0.15, 0.65, 7.8, 0.925),
+            Material("M11 100mm lightweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 0.53, 1280.0, 840.0, 0.1016, 0.15, 0.65, 7.8, 0.925),
+            Material("M12 150mm lightweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 0.53, 1280.0, 840.0, 0.1524, 0.15, 0.65, 11.7, 0.925),
+            Material("M13 200mm lightweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 0.53, 1280.0, 840.0, 0.2032, 0.15, 0.65, 15.6, 0.925),
+            Material("M14 100mm heavyweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 1.95, 2240.0, 900.0, 0.1016, 0.2, 0.65, 18.2, 0.925),
+            Material("M14a 100mm heavyweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 1.95, 2240.0, 900.0, 0.1016, 0.2, 0.65, 18.2, 0.925),
+            Material("M15 200mm heavyweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 1.95, 2240.0, 900.0, 0.2032, 0.2, 0.65, 36.4, 0.925),
+            Material("M16 300mm heavyweight concrete", MaterialCategory.STRUCTURAL_MATERIALS, 1.95, 2240.0, 900.0, 0.3048, 0.2, 0.65, 54.6, 0.925),
+            Material("M17 100mm stone", MaterialCategory.STRUCTURAL_MATERIALS, 2.10, 2240.0, 880.0, 0.1016, 0.2, 0.7, 22.8, 0.925),
+            Material("M18 150mm stone", MaterialCategory.STRUCTURAL_MATERIALS, 2.10, 2240.0, 880.0, 0.1524, 0.2, 0.7, 34.1, 0.925),
+            Material("M19 100mm limestone", MaterialCategory.STRUCTURAL_MATERIALS, 1.80, 2320.0, 880.0, 0.1016, 0.2, 0.6, 23.6, 0.925),
+            Material("M20 150mm limestone", MaterialCategory.STRUCTURAL_MATERIALS, 1.80, 2320.0, 880.0, 0.1524, 0.2, 0.6, 35.4, 0.925),
+            Material("M21 200mm limestone", MaterialCategory.STRUCTURAL_MATERIALS, 1.80, 2320.0, 880.0, 0.2032, 0.2, 0.6, 47.1, 0.925),
+            Material("M22 100mm granite", MaterialCategory.STRUCTURAL_MATERIALS, 2.80, 2640.0, 880.0, 0.1016, 0.2, 0.7, 26.8, 0.925),
+            Material("M23 150mm granite", MaterialCategory.STRUCTURAL_MATERIALS, 2.80, 2640.0, 880.0, 0.1524, 0.2, 0.7, 40.2, 0.925),
+            Material("M24 200mm granite", MaterialCategory.STRUCTURAL_MATERIALS, 2.80, 2640.0, 880.0, 0.2032, 0.2, 0.7, 53.6, 0.925),
+            Material("M25 100mm marble", MaterialCategory.STRUCTURAL_MATERIALS, 2.50, 2720.0, 880.0, 0.1016, 0.2, 0.6, 27.6, 0.925),
+            Material("M26 150mm marble", MaterialCategory.STRUCTURAL_MATERIALS, 2.50, 2720.0, 880.0, 0.1524, 0.2, 0.6, 41.4, 0.925),
+            Material("M27 200mm marble", MaterialCategory.STRUCTURAL_MATERIALS, 2.50, 2720.0, 880.0, 0.2032, 0.2, 0.6, 55.3, 0.925),
+        ]
+        return {mat.name: mat for mat in materials}
+
+    def initialize_glazing_materials(self) -> Dict[str, GlazingMaterial]:
+        glazing_materials = [
+            # ASHRAE-based glazing materials with Australian pricing
+            GlazingMaterial("Single Clear 3mm", 5.8, 0.81, 25.0, 50.0, 17.8),
+            GlazingMaterial("Single Clear 6mm", 5.7, 0.78, 28.0, 60.0, 17.8),
+            GlazingMaterial("Single Tinted 6mm", 5.7, 0.55, 30.0, 70.0, 17.8),
+            GlazingMaterial("Double Clear 6mm/13mm Air", 2.7, 0.70, 40.0, 100.0, 17.8),
+            GlazingMaterial("Double Low-E 6mm/13mm Air", 1.8, 0.60, 45.0, 120.0, 17.8),
+            GlazingMaterial("Double Tinted 6mm/13mm Air", 2.7, 0.45, 42.0, 110.0, 17.8),
+            GlazingMaterial("Double Low-E 6mm/13mm Argon", 1.5, 0.55, 48.0, 130.0, 17.8),
+            GlazingMaterial("Triple Clear 4mm/12mm Air", 1.8, 0.62, 55.0, 150.0, 17.8),
+            GlazingMaterial("Triple Low-E 4mm/12mm Argon", 0.9, 0.50, 60.0, 180.0, 17.8),
+            GlazingMaterial("Single Low-E Reflective 6mm", 5.6, 0.35, 35.0, 90.0, 13.0),
+            GlazingMaterial("Double Reflective 6mm/13mm Air", 2.5, 0.30, 50.0, 140.0, 13.0),
+            GlazingMaterial("Electrochromic 6mm/13mm Air", 2.0, 0.40, 70.0, 200.0, 17.8),
+        ]
+        return {mat.name: mat for mat in glazing_materials}
+
+    def initialize_door_materials(self) -> Dict[str, DoorMaterial]:
+        door_materials = [
+            # Door materials with ASHRAE-based properties, Australian pricing, and inferred properties
+            DoorMaterial("Solid Wood 45mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.15, 608.0, 1630.0, 0.045, 2.5, 0.50, 15.0, 200.0, 0.925),
+            DoorMaterial("Insulated Wood 50mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.10, 500.0, 1400.0, 0.050, 1.8, 0.45, 18.0, 250.0, 0.925),
+            DoorMaterial("Hollow Core Wood 40mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.15, 400.0, 1630.0, 0.040, 3.5, 0.50, 12.0, 150.0, 0.925),
+            DoorMaterial("Steel Uninsulated 45mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 45.28, 7824.0, 500.0, 0.045, 5.0, 0.70, 20.0, 180.0, 0.075),
+            DoorMaterial("Steel Insulated 50mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.10, 2000.0, 1000.0, 0.050, 2.0, 0.65, 25.0, 220.0, 0.925),
+            DoorMaterial("Aluminum Uninsulated 45mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 160.0, 2700.0, 900.0, 0.045, 6.0, 0.75, 22.0, 200.0, 0.075),
+            DoorMaterial("Aluminum Insulated 50mm", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.15, 1800.0, 1100.0, 0.050, 2.5, 0.70, 28.0, 240.0, 0.925),
+            DoorMaterial("Glass Single 6mm", MaterialCategory.STRUCTURAL_MATERIALS, 0.53, 1280.0, 840.0, 0.006, 5.7, 0.78, 28.0, 100.0, 0.90),
+            DoorMaterial("Glass Double 6mm/13mm Air", MaterialCategory.STRUCTURAL_MATERIALS, 0.40, 1280.0, 840.0, 0.025, 2.7, 0.70, 40.0, 150.0, 0.90),
+            DoorMaterial("Fiberglass Insulated 50mm", MaterialCategory.INSULATION, 0.03, 43.0, 1210.0, 0.050, 1.5, 0.60, 20.0, 230.0, 0.925),
+            DoorMaterial("PVC Insulated 50mm", MaterialCategory.INSULATION, 0.05, 1400.0, 1000.0, 0.050, 1.7, 0.55, 18.0, 210.0, 0.925),
+            DoorMaterial("Wood with Glass Insert", MaterialCategory.SUB_STRUCTURAL_MATERIALS, 0.15, 608.0, 1630.0, 0.045, 3.0, 0.65, 16.0, 190.0, 0.925),
         ]
-        return {m.name: m for m in materials}
+        return {mat.name: mat for mat in door_materials}
 
     def initialize_constructions(self) -> Dict[str, Construction]:
-        # This method defines a set of standard building constructions.
-        # Each construction is composed of layers of materials defined in initialize_materials().
-        materials = self.library_materials
         constructions = [
-            # Walls
-            Construction("Wall-100mm Brick-13mm Gypsum", "Wall", [
-                {"material": materials["M01 100mm brick"], "thickness": 0.1016},
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Light Exterior Wall", "Wall", [
+                {"material": self.library_materials["F08 Metal surface"], "thickness": 0.001},
+                {"material": self.library_materials["I02 50mm insulation board"], "thickness": 0.0508},
+                {"material": self.library_materials["F04 Wall air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["G01a 19mm gypsum board"], "thickness": 0.0191}
             ]),
-            Construction("Wall-100mm Concrete Block-13mm Cement Plaster", "Wall", [
-                {"material": materials["M08 100mm concrete block"], "thickness": 0.1016},
-                {"material": materials["F13 13mm cement plaster"], "thickness": 0.0127}
+            Construction("Light Roof/Ceiling", "Roof", [
+                {"material": self.library_materials["M11 100mm lightweight concrete"], "thickness": 0.1016},
+                {"material": self.library_materials["F05 Ceiling air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["F16 Acoustic tile"], "thickness": 0.0191}
             ]),
-            Construction("Wall-200mm Concrete Block-25mm Stucco", "Wall", [
-                {"material": materials["M04 200mm concrete block"], "thickness": 0.2032},
-                {"material": materials["F07 25mm stucco"], "thickness": 0.0254}
+            Construction("Light Floor", "Floor", [
+                {"material": self.library_materials["F16 Acoustic tile"], "thickness": 0.0191},
+                {"material": self.library_materials["F05 Ceiling air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["M11 100mm lightweight concrete"], "thickness": 0.1016}
             ]),
-            Construction("Wall-EIFS-13mm Gypsum", "Wall", [
-                {"material": materials["F06 EIFS finish"], "thickness": 0.0095},
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Medium Exterior Wall", "Wall", [
+                {"material": self.library_materials["M01 100mm brick"], "thickness": 0.1016},
+                {"material": self.library_materials["I02 50mm insulation board"], "thickness": 0.0508},
+                {"material": self.library_materials["F04 Wall air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["G01a 19mm gypsum board"], "thickness": 0.0191}
             ]),
-            Construction("Wall-Wood Siding-19mm Plywood-13mm Gypsum", "Wall", [
-                {"material": materials["S08 19mm wood siding"], "thickness": 0.0191},
-                {"material": materials["P02 19mm plywood"], "thickness": 0.0191},
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Medium Roof/Ceiling", "Roof", [
+                {"material": self.library_materials["M14a 100mm heavyweight concrete"], "thickness": 0.1016},
+                {"material": self.library_materials["F05 Ceiling air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["F16 Acoustic tile"], "thickness": 0.0191}
             ]),
-            Construction("Wall-Metal-13mm Gypsum", "Wall", [
-                {"material": materials["F08 Metal surface"], "thickness": 0.001},
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Medium Floor", "Floor", [
+                {"material": self.library_materials["F16 Acoustic tile"], "thickness": 0.0191},
+                {"material": self.library_materials["F05 Ceiling air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["M14a 100mm heavyweight concrete"], "thickness": 0.1016}
             ]),
-            Construction("Wall-Brick Veneer-Air Space-13mm Gypsum", "Wall", [
-                {"material": materials["S10 13mm brick veneer"], "thickness": 0.0127},
-                {"material": materials["F04 Wall air space resistance"], "thickness": 0.01}, # Represents air gap
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Heavy Exterior Wall", "Wall", [
+                {"material": self.library_materials["M01 100mm brick"], "thickness": 0.1016},
+                {"material": self.library_materials["M15 200mm heavyweight concrete"], "thickness": 0.2032},
+                {"material": self.library_materials["I02 50mm insulation board"], "thickness": 0.0508},
+                {"material": self.library_materials["F04 Wall air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["G01a 19mm gypsum board"], "thickness": 0.0191}
             ]),
-            Construction("Wall-200mm Heavy Concrete-13mm Gypsum", "Wall", [
-                {"material": materials["M27 200mm concrete slab (heavy)"], "thickness": 0.2032},
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Heavy Roof/Ceiling", "Roof", [
+                {"material": self.library_materials["M15 200mm heavyweight concrete"], "thickness": 0.2032},
+                {"material": self.library_materials["F05 Ceiling air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["F16 Acoustic tile"], "thickness": 0.0191}
             ]),
-            Construction("Wall-200mm Lightweight Concrete-13mm Gypsum", "Wall", [
-                {"material": materials["M22 200mm lightweight concrete slab"], "thickness": 0.2032},
-                {"material": materials["F10 13mm gypsum board"], "thickness": 0.0127}
+            Construction("Heavy Floor", "Floor", [
+                {"material": self.library_materials["F16 Acoustic tile"], "thickness": 0.0191},
+                {"material": self.library_materials["F05 Ceiling air space resistance"], "thickness": 0.01},
+                {"material": self.library_materials["M15 200mm heavyweight concrete"], "thickness": 0.2032}
             ]),
+        ]
+        return {cons.name: cons for cons in constructions}
 
-            # Roofs
-            Construction("Roof-Asphalt Shingle-19mm Plywood-50mm Insulation", "Roof", [
-                {"material": materials["S15 13mm asphalt shingle"], "thickness": 0.0127},
-                {"material": materials["P02 19mm plywood"], "thickness": 0.0191},
-                {"material": materials["I02 50mm insulation board"], "thickness": 0.0508}
-            ]),
-            Construction("Roof-Metal-75mm Insulation", "Roof", [
-                {"material": materials["F08 Metal surface"], "thickness": 0.001},
-                {"material": materials["I03 75mm insulation board"], "thickness": 0.0762}
-            ]),
-            Construction("Roof-Concrete Slab 150mm-25mm Insulation", "Roof", [
-                {"material": materials["M14 150mm concrete slab"], "thickness": 0.1524},
-                {"material": materials["I01 25mm insulation board"], "thickness": 0.0254}
-            ]),
-            Construction("Roof-Acoustic Tile-Air Space", "Roof", [
-                {"material": materials["F16 Acoustic tile"], "thickness": 0.0191},
-                {"material": materials["F05 Ceiling air space resistance"], "thickness": 0.01} # Represents ceiling air space
-            ]),
+    def get_all_materials(self, project_materials: Optional[Dict[str, Material]] = None) -> List[Material]:
+        materials = list(self.library_materials.values())
+        if project_materials:
+            materials.extend(list(project_materials.values()))
+        return materials
 
-            # Floors
-            Construction("Floor-100mm Concrete Slab-13mm Ceramic Tile", "Floor", [
-                {"material": materials["M13 100mm concrete slab"], "thickness": 0.1016},
-                {"material": materials["T01 13mm ceramic tile"], "thickness": 0.0127}
-            ]),
-            Construction("Floor-150mm Concrete Slab-13mm Vinyl Tile", "Floor", [
-                {"material": materials["M14 150mm concrete slab"], "thickness": 0.1524},
-                {"material": materials["T03 13mm vinyl tile"], "thickness": 0.0032}
-            ]),
-            Construction("Floor-Wood-13mm Carpet", "Floor", [
-                {"material": materials["G05 25mm wood"], "thickness": 0.0254}, # Using 25mm wood as subfloor
-                {"material": materials["T05 13mm carpet"], "thickness": 0.0127}
-            ]),
-            Construction("Floor-200mm Lightweight Concrete-25mm Carpet", "Floor", [
-                {"material": materials["M22 200mm lightweight concrete slab"], "thickness": 0.2032},
-                {"material": materials["T06 25mm carpet"], "thickness": 0.0254}
-            ]),
+    def get_all_glazing_materials(self, project_glazing_materials: Optional[Dict[str, GlazingMaterial]] = None) -> List[GlazingMaterial]:
+        materials = list(self.library_glazing_materials.values())
+        if project_glazing_materials:
+            materials.extend(list(project_glazing_materials.values()))
+        return materials
 
-            # Doors (using materials from the main materials dictionary)
-            Construction("Door-Solid Wood", "Door", [
-                {"material": materials["D01 Wood Door - Solid Core"], "thickness": materials["D01 Wood Door - Solid Core"].default_thickness}
-            ]),
-            Construction("Door-Hollow Wood", "Door", [
-                {"material": materials["D02 Wood Door - Hollow Core"], "thickness": materials["D02 Wood Door - Hollow Core"].default_thickness}
-            ]),
-            Construction("Door-Insulated Steel", "Door", [
-                {"material": materials["D03 Steel Door - Insulated"], "thickness": materials["D03 Steel Door - Insulated"].default_thickness}
-            ]),
-            Construction("Door-Fiberglass", "Door", [
-                {"material": materials["D05 Fiberglass Door"], "thickness": materials["D05 Fiberglass Door"].default_thickness}
-            ]),
-            Construction("Door-Single Pane Glass", "Door", [
-                {"material": materials["D08 Glass Door - Single Pane"], "thickness": materials["D08 Glass Door - Single Pane"].default_thickness}
-            ]),
-            Construction("Door-Double Pane Glass", "Door", [
-                {"material": materials["D09 Glass Door - Double Pane"], "thickness": materials["D09 Glass Door - Double Pane"].default_thickness}
-            ]),
-            Construction("Door-PVC", "Door", [
-                {"material": materials["D10 PVC Door"], "thickness": materials["D10 PVC Door"].default_thickness}
-            ]),
-            Construction("Door-Composite", "Door", [
-                {"material": materials["D11 Composite Door"], "thickness": materials["D11 Composite Door"].default_thickness}
-            ]),
-        ]
-        return {c.name: c for c in constructions}
+    def get_all_door_materials(self, project_door_materials: Optional[Dict[str, DoorMaterial]] = None) -> List[DoorMaterial]:
+        materials = list(self.library_door_materials.values())
+        if project_door_materials:
+            materials.extend(list(project_door_materials.values()))
+        return materials
 
-    def initialize_glazing_materials(self) -> Dict[str, GlazingMaterial]:
-        # This method defines a set of standard glazing materials.
-        glazing_materials = [
-            GlazingMaterial("Single Pane Clear", 5.8, 0.81, 15.0, 20.0, 25.0),
-            GlazingMaterial("Double Pane Clear (6mm air)", 2.8, 0.76, 30.0, 40.0, 25.0),
-            GlazingMaterial("Double Pane Low-E (6mm air)", 1.8, 0.5, 35.0, 60.0, 25.0),
-            GlazingMaterial("Triple Pane Clear (6mm air)", 1.8, 0.7, 45.0, 70.0, 25.0),
-            GlazingMaterial("Triple Pane Low-E (6mm air)", 1.0, 0.4, 50.0, 90.0, 25.0),
-        ]
-        return {gm.name: gm for gm in glazing_materials}
+    def add_project_material(self, material: Material, project_materials: Dict[str, Material]) -> Tuple[bool, str]:
+        if len(project_materials) >= 20:
+            return False, "Maximum 20 project materials allowed."
+        if material.name in project_materials or material.name in self.library_materials:
+            return False, f"Material name '{material.name}' already exists."
+        project_materials[material.name] = material
+        return True, f"Material '{material.name}' added to project materials."
 
-    def get_all_materials(self, project_materials: Optional[Dict[str, Material]] = None) -> Dict[str, Material]:
-        # Combines library materials with any project-specific materials.
-        all_materials = self.library_materials.copy()
-        if project_materials:
-            all_materials.update(project_materials)
-        return all_materials
-
-    def get_all_constructions(self, project_constructions: Optional[Dict[str, Construction]] = None) -> Dict[str, Construction]:
-        # Combines library constructions with any project-specific constructions.
-        all_constructions = self.library_constructions.copy()
-        if project_constructions:
-            all_constructions.update(project_constructions)
-        return all_constructions
-
-    def get_all_glazing_materials(self, project_glazing_materials: Optional[Dict[str, GlazingMaterial]] = None) -> Dict[str, GlazingMaterial]:
-        # Combines library glazing materials with any project-specific glazing materials.
-        all_glazing_materials = self.library_glazing_materials.copy()
-        if project_glazing_materials:
-            all_glazing_materials.update(project_glazing_materials)
-        return all_glazing_materials
+    def add_project_glazing_material(self, material: GlazingMaterial, project_glazing_materials: Dict[str, GlazingMaterial]) -> Tuple[bool, str]:
+        if len(project_glazing_materials) >= 20:
+            return False, "Maximum 20 project glazing materials allowed."
+        if material.name in project_glazing_materials or material.name in self.library_glazing_materials:
+            return False, f"Glazing material name '{material.name}' already exists."
+        project_glazing_materials[material.name] = material
+        return True, f"Glazing material '{material.name}' added to project glazing materials."
+
+    def add_project_door_material(self, material: DoorMaterial, project_door_materials: Dict[str, DoorMaterial]) -> Tuple[bool, str]:
+        if len(project_door_materials) >= 20:
+            return False, "Maximum 20 project door materials allowed."
+        if material.name in project_door_materials or material.name in self.library_door_materials:
+            return False, f"Door material name '{material.name}' already exists."
+        project_door_materials[material.name] = material
+        return True, f"Door material '{material.name}' added to project door materials."
+
+    def edit_project_material(self, old_name: str, new_material: Material, project_materials: Dict[str, Material],
+                             components: Dict[str, List]) -> Tuple[bool, str]:
+        if old_name not in project_materials:
+            return False, f"Material '{old_name}' not found in project materials."
+        if new_material.name != old_name and (new_material.name in project_materials or new_material.name in self.library_materials):
+            return False, f"Material name '{new_material.name}' already exists."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.construction and any(layer["material"].name == old_name for layer in comp.layers):
+                    comp.layers = [{"material": new_material if layer["material"].name == old_name else layer["material"],
+                                    "thickness": layer["thickness"]} for layer in comp.layers]
+                    comp.construction = Construction(
+                        name=comp.construction.name,
+                        component_type=comp.construction.component_type,
+                        layers=comp.layers,
+                        is_library=comp.construction.is_library
+                    )
+        project_materials.pop(old_name)
+        project_materials[new_material.name] = new_material
+        return True, f"Material '{old_name}' updated to '{new_material.name}'."
+
+    def edit_project_glazing_material(self, old_name: str, new_material: GlazingMaterial,
+                                     project_glazing_materials: Dict[str, GlazingMaterial],
+                                     components: Dict[str, List]) -> Tuple[bool, str]:
+        if old_name not in project_glazing_materials:
+            return False, f"Glazing material '{old_name}' not found in project glazing materials."
+        if new_material.name != old_name and (new_material.name in project_glazing_materials or new_material.name in self.library_glazing_materials):
+            return False, f"Glazing material name '{new_material.name}' already exists."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.glazing_material and comp.glazing_material.name == old_name:
+                    comp.glazing_material = new_material
+                    comp.u_value = new_material.u_value
+                    comp.shgc = new_material.shgc
+                    comp.h_o = new_material.h_o
+        project_glazing_materials.pop(old_name)
+        project_glazing_materials[new_material.name] = new_material
+        return True, f"Glazing material '{old_name}' updated to '{new_material.name}'."
+
+    def edit_project_door_material(self, old_name: str, new_material: DoorMaterial,
+                                  project_door_materials: Dict[str, DoorMaterial],
+                                  components: Dict[str, List]) -> Tuple[bool, str]:
+        if old_name not in project_door_materials:
+            return False, f"Door material '{old_name}' not found in project door materials."
+        if new_material.name != old_name and (new_material.name in project_door_materials or new_material.name in self.library_door_materials):
+            return False, f"Door material name '{new_material.name}' already exists."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.door_material and comp.door_material.name == old_name:
+                    comp.door_material = new_material
+                    comp.u_value = new_material.u_value
+                    comp.solar_absorptivity = new_material.solar_absorption
+        project_door_materials.pop(old_name)
+        project_door_materials[new_material.name] = new_material
+        return True, f"Door material '{old_name}' updated to '{new_material.name}'."
+
+    def delete_project_material(self, name: str, project_materials: Dict[str, Material], components: Dict[str, List]) -> Tuple[bool, str]:
+        if name not in project_materials:
+            return False, f"Material '{name}' not found in project materials."
+        for cons in self.library_constructions.values():
+            if any(layer["material"].name == name for layer in cons.layers):
+                return False, f"Cannot delete '{name}' as it is used in library construction '{cons.name}'."
+        for comp_type, comp_list in components.items():
+            for comp in comp_list:
+                if 'layers' in comp and any(layer["material"].name == name for layer in comp["layers"]):
+                    return False, f"Cannot delete '{name}' as it is used in component '{comp['name']}' ({comp_type})."
+        del project_materials[name]
+        return True, f"Material '{name}' deleted successfully."
+
+    def delete_project_glazing_material(self, name: str, project_glazing_materials: Dict[str, GlazingMaterial],
+                                       components: Dict[str, List]) -> Tuple[bool, str]:
+        if name not in project_glazing_materials:
+            return False, f"Glazing material '{name}' not found in project glazing materials."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.glazing_material and comp.glazing_material.name == name:
+                    return False, f"Cannot delete '{name}' as it is used in component '{comp.name}'."
+        del project_glazing_materials[name]
+        return True, f"Glazing material '{name}' deleted successfully."
+
+    def delete_project_door_material(self, name: str, project_door_materials: Dict[str, DoorMaterial],
+                                    components: Dict[str, List]) -> Tuple[bool, str]:
+        if name not in project_door_materials:
+            return False, f"Door material '{name}' not found in project door materials."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.door_material and comp.door_material.name == name:
+                    return False, f"Cannot delete '{name}' as it is used in component '{comp.name}'."
+        del project_door_materials[name]
+        return True, f"Door material '{name}' deleted successfully."
+
+    def add_project_construction(self, construction: Construction, project_constructions: Dict[str, Construction]) -> Tuple[bool, str]:
+        if len(project_constructions) >= 20:
+            return False, "Maximum 20 project constructions allowed."
+        if construction.name in project_constructions or construction.name in self.library_constructions:
+            return False, f"Construction name '{construction.name}' already exists."
+        project_constructions[construction.name] = construction
+        return True, f"Construction '{construction.name}' added to project constructions."
+
+    def edit_project_construction(self, old_name: str, new_construction: Construction,
+                                 project_constructions: Dict[str, Construction],
+                                 components: Dict[str, List]) -> Tuple[bool, str]:
+        if old_name not in project_constructions:
+            return False, f"Construction '{old_name}' not found in project constructions."
+        if new_construction.name != old_name and (new_construction.name in project_constructions or new_construction.name in self.library_constructions):
+            return False, f"Construction name '{new_construction.name}' already exists."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.construction and comp.construction.name == old_name:
+                    comp.construction = new_construction
+                    comp.layers = new_construction.layers
+                    comp.u_value = new_construction.u_value
+        project_constructions.pop(old_name)
+        project_constructions[new_construction.name] = new_construction
+        return True, f"Construction '{old_name}' updated to '{new_construction.name}'."
 
-    def to_dataframe(self, data_type: str, only_project: bool = False,
-                     project_materials: Optional[Dict[str, Material]] = None,
+    def delete_project_construction(self, name: str, project_constructions: Dict[str, Construction],
+                                   components: Dict[str, List]) -> Tuple[bool, str]:
+        if name not in project_constructions:
+            return False, f"Construction '{name}' not found in project constructions."
+        for comp_list in components.values():
+            for comp in comp_list:
+                if comp.construction and comp.construction.name == name:
+                    return False, f"Construction '{name}' is used in component '{comp.name}'."
+        project_constructions.pop(name)
+        return True, f"Construction '{name}' deleted."
+
+    def to_dataframe(self, data_type: str, project_materials: Optional[Dict[str, Material]] = None,
                      project_constructions: Optional[Dict[str, Construction]] = None,
-                     project_glazing_materials: Optional[Dict[str, GlazingMaterial]] = None) -> pd.DataFrame:
-        # Converts library data (or project data) into a pandas DataFrame for easy viewing and analysis.
+                     project_glazing_materials: Optional[Dict[str, GlazingMaterial]] = None,
+                     project_door_materials: Optional[Dict[str, DoorMaterial]] = None,
+                     only_project: bool = False) -> pd.DataFrame:
         if data_type == "materials":
             data = []
-            materials = project_materials.values() if only_project else self.get_all_materials(project_materials).values()
+            materials = project_materials.values() if only_project else self.get_all_materials(project_materials)
             for mat in materials:
                 data.append({
                     "Name": mat.name,
                     "Category": mat.category.value,
-                    "U-Value (W/m·K)": mat.u_value, # This is conductivity (k)
+                    "Conductivity (W/m·K)": mat.conductivity,
                     "Density (kg/m³)": mat.density,
                     "Specific Heat (J/kg·K)": mat.specific_heat,
                     "Default Thickness (m)": mat.default_thickness,
                     "Embodied Carbon (kgCO₂e/kg)": mat.embodied_carbon,
-                    "Solar Absorptance": mat.solar_absorptance,
+                    "Solar Absorption": mat.solar_absorption,
                     "Price (USD/m²)": mat.price,
                     "Emissivity": mat.emissivity,
                     "Source": "Project" if not mat.is_library else "Library"
@@ -429,23 +472,26 @@ class MaterialLibrary:
             return pd.DataFrame(data)
         elif data_type == "constructions":
             data = []
-            constructions = project_constructions.values() if only_project else self.get_all_constructions(project_constructions).values()
-            for const in constructions:
+            constructions = project_constructions.values() if only_project else list(self.library_constructions.values())
+            if not only_project and project_constructions:
+                constructions.extend(list(project_constructions.values()))
+            for cons in constructions:
+                layers_str = "; ".join(f"{layer['material'].name} ({layer['thickness']}m)" for layer in cons.layers)
                 data.append({
-                    "Name": const.name,
-                    "Component Type": const.component_type,
-                    "U-Value (W/m²·K)": const.u_value,
-                    "Total Thickness (m)": const.total_thickness,
-                    "Embodied Carbon (kgCO₂e)": const.embodied_carbon,
-                    "Solar Absorptance": const.solar_absorptance,
-                    "Price (USD)": const.price,
-                    "Thermal Mass": const.get_thermal_mass().value,
-                    "Source": "Project" if not const.is_library else "Library"
+                    "Name": cons.name,
+                    "Component Type": cons.component_type,
+                    "U-Value (W/m²·K)": cons.u_value,
+                    "Total Thickness (m)": cons.total_thickness,
+                    "Embodied Carbon (kgCO₂e/m²)": cons.embodied_carbon,
+                    "Solar Absorption": cons.solar_absorption,
+                    "Price (USD/m²)": cons.price,
+                    "Layers": layers_str,
+                    "Source": "Project" if not cons.is_library else "Library"
                 })
             return pd.DataFrame(data)
         elif data_type == "glazing_materials":
             data = []
-            glazing_materials = project_glazing_materials.values() if only_project else self.get_all_glazing_materials(project_glazing_materials).values()
+            glazing_materials = project_glazing_materials.values() if only_project else self.get_all_glazing_materials(project_glazing_materials)
             for mat in glazing_materials:
                 data.append({
                     "Name": mat.name,
@@ -457,5 +503,23 @@ class MaterialLibrary:
                     "Source": "Project" if not mat.is_library else "Library"
                 })
             return pd.DataFrame(data)
-        else:
-            raise ValueError("Invalid data_type specified. Choose 'materials', 'constructions', or 'glazing_materials'.")
+        elif data_type == "door_materials":
+            data = []
+            door_materials = project_door_materials.values() if only_project else self.get_all_door_materials(project_door_materials)
+            for mat in door_materials:
+                data.append({
+                    "Name": mat.name,
+                    "Category": mat.category.value,
+                    "Conductivity (W/m·K)": mat.conductivity,
+                    "Density (kg/m³)": mat.density,
+                    "Specific Heat (J/kg·K)": mat.specific_heat,
+                    "Default Thickness (m)": mat.default_thickness,
+                    "U-Value (W/m²·K)": mat.u_value,
+                    "Solar Absorption": mat.solar_absorption,
+                    "Embodied Carbon (kgCO₂e/m²)": mat.embodied_carbon,
+                    "Price (USD/m²)": mat.price,
+                    "Emissivity": mat.emissivity,
+                    "Source": "Project" if not mat.is_library else "Library"
+                })
+            return pd.DataFrame(data)
+        return pd.DataFrame()