Update app/component_selection.py

app/component_selection.py

@@ -3,6 +3,7 @@ HVAC Component Selection Module
 Provides UI for selecting building components in the HVAC Load Calculator.
 All dependencies are included within this file for standalone operation.
 Updated 2025-04-28: Added perimeter field to Floor class for F-factor calculations.
+Updated 2025-04-29: Fixed Floors table headings, added insulated field for dynamic F-factor.
 """
 
 import streamlit as st
@@ -66,7 +67,7 @@ class BuildingComponent:
 @dataclass
 class Wall(BuildingComponent):
     wall_type: str = "Brick"
-    wall_group: str = "A"  # Changed default to valid ASHRAE group
+    wall_group: str = "A"  # ASHRAE group
     absorptivity: float = 0.6
     shading_coefficient: float = 1.0
     infiltration_rate_cfm: float = 0.0
@@ -80,7 +81,6 @@ class Wall(BuildingComponent):
             raise ValueError("Shading coefficient must be between 0 and 1")
         if self.infiltration_rate_cfm < 0:
             raise ValueError("Infiltration rate cannot be negative")
-        # Validate wall_group
         VALID_WALL_GROUPS = {"A", "B", "C", "D", "E", "F", "G", "H"}
         if self.wall_group not in VALID_WALL_GROUPS:
             st.warning(f"Invalid wall_group '{self.wall_group}' for wall '{self.name}'. Defaulting to 'A'.")
@@ -97,7 +97,7 @@ class Wall(BuildingComponent):
 @dataclass
 class Roof(BuildingComponent):
     roof_type: str = "Concrete"
-    roof_group: str = "A"  # Changed to letter-based ASHRAE group
+    roof_group: str = "A"  # ASHRAE group
     slope: str = "Flat"
     absorptivity: float = 0.6
 
@@ -108,7 +108,6 @@ class Roof(BuildingComponent):
             self.orientation = Orientation.HORIZONTAL
         if not 0 <= self.absorptivity <= 1:
             raise ValueError("Absorptivity must be between 0 and 1")
-        # Validate roof_group
         VALID_ROOF_GROUPS = {"A", "B", "C", "D", "E", "F", "G"}
         if self.roof_group not in VALID_ROOF_GROUPS:
             st.warning(f"Invalid roof_group '{self.roof_group}' for roof '{self.name}'. Defaulting to 'A'.")
@@ -126,7 +125,8 @@ class Floor(BuildingComponent):
     floor_type: str = "Concrete"
     ground_contact: bool = True
     ground_temperature_c: float = 25.0
-    perimeter: float = 0.0  # NEW: Perimeter in meters for F-factor calculations
+    perimeter: float = 0.0
+    insulated: bool = False  # NEW: For dynamic F-factor
 
     def __post_init__(self):
         super().__post_init__()
@@ -141,7 +141,8 @@ class Floor(BuildingComponent):
         base_dict = super().to_dict()
         base_dict.update({
             "floor_type": self.floor_type, "ground_contact": self.ground_contact,
-            "ground_temperature_c": self.ground_temperature_c, "perimeter": self.perimeter
+            "ground_temperature_c": self.ground_temperature_c, "perimeter": self.perimeter,
+            "insulated": self.insulated
         })
         return base_dict
 
@@ -376,7 +377,6 @@ class ComponentSelectionInterface:
         elif method == "File Upload":
             uploaded_file = st.file_uploader("Upload Walls File", type=["csv", "xlsx"], key="wall_upload")
             required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)"]
-            # Provide template with valid wall_group values
             template_data = pd.DataFrame(columns=required_cols)
             template_data.loc[0] = ["Example Wall", 10.0, 2.0, "North", "Brick Wall", "A", 0.6, 1.0, 0.0]
             st.download_button(label="Download Wall Template", data=template_data.to_csv(index=False), file_name="wall_template.csv", mime="text/csv")
@@ -411,7 +411,6 @@ class ComponentSelectionInterface:
         if "add_roof_submitted" not in session_state:
             session_state.add_roof_submitted = False
 
-        # Shared Roof-Level Fields
         st.subheader("Roof System Ventilation")
         air_volume = st.number_input("Air Volume (m³)", min_value=0.0, value=session_state.roof_air_volume_m3, step=1.0, help="Total volume between roof and ceiling")
         vent_options = {f"{k} (ACH={v})": v for k, v in self.reference_data.data["roof_ventilation_methods"].items()}
@@ -432,7 +431,7 @@ class ComponentSelectionInterface:
                     roof_options = self.reference_data.data["roof_types"]
                     selected_roof = st.selectbox("Roof Type", options=list(roof_options.keys()))
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(roof_options[selected_roof]["u_value"]), step=0.01)
-                    roof_group = st.selectbox("Roof Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G"], index=0)  # Updated to letter-based groups
+                    roof_group = st.selectbox("Roof Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G"], index=0)
                     slope = st.selectbox("Slope", ["Flat", "Pitched"], index=0)
                     absorptivity = st.selectbox("Solar Absorptivity", ["Light (0.3)", "Light to Medium (0.45)", "Medium (0.6)", "Medium to Dark (0.75)", "Dark (0.9)"], index=2)
 
@@ -458,7 +457,6 @@ class ComponentSelectionInterface:
         elif method == "File Upload":
             uploaded_file = st.file_uploader("Upload Roofs File", type=["csv", "xlsx"], key="roof_upload")
             required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Roof Type", "Roof Group", "Slope", "Absorptivity"]
-            # Provide template with valid roof_group values
             template_data = pd.DataFrame(columns=required_cols)
             template_data.loc[0] = ["Example Roof", 10.0, 0.3, "Horizontal", "Concrete Roof", "A", "Flat", 0.6]
             st.download_button(label="Download Roof Template", data=template_data.to_csv(index=False), file_name="roof_template.csv", mime="text/csv")
@@ -498,13 +496,14 @@ class ComponentSelectionInterface:
                 with col1:
                     name = st.text_input("Name", "New Floor")
                     area = st.number_input("Area (m²)", min_value=0.0, value=1.0, step=0.1)
-                    perimeter = st.number_input("Perimeter (m)", min_value=0.0, value=0.0, step=0.1)  # NEW: Perimeter input
+                    perimeter = st.number_input("Perimeter (m)", min_value=0.0, value=0.0, step=0.1)
                 with col2:
                     floor_options = self.reference_data.data["floor_types"]
                     selected_floor = st.selectbox("Floor Type", options=list(floor_options.keys()))
                     u_value = st.number_input("U-Value (W/m²·K)", min_value=0.0, value=float(floor_options[selected_floor]["u_value"]), step=0.01)
                     ground_contact = st.selectbox("Ground Contact", ["Yes", "No"], index=0 if floor_options[selected_floor]["ground_contact"] else 1)
                     ground_temp = st.number_input("Ground Temperature (°C)", min_value=-10.0, max_value=40.0, value=25.0, step=0.1) if ground_contact == "Yes" else 25.0
+                    insulated = st.checkbox("Insulated Floor (e.g., R-10)", value=False)  # NEW: Insulation option
 
                 submitted = st.form_submit_button("Add Floor")
                 if submitted and not session_state.add_floor_submitted:
@@ -512,7 +511,7 @@ class ComponentSelectionInterface:
                         new_floor = Floor(
                             name=name, u_value=u_value, area=area, floor_type=selected_floor,
                             ground_contact=(ground_contact == "Yes"), ground_temperature_c=ground_temp,
-                            perimeter=perimeter  # NEW: Pass perimeter
+                            perimeter=perimeter, insulated=insulated
                         )
                         self.component_library.add_component(new_floor)
                         session_state.components['floors'].append(new_floor)
@@ -527,19 +526,21 @@ class ComponentSelectionInterface:
 
         elif method == "File Upload":
             uploaded_file = st.file_uploader("Upload Floors File", type=["csv", "xlsx"], key="floor_upload")
-            required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact", "Ground Temperature (°C)", "Perimeter (m)"]  # NEW: Added Perimeter
+            required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact", "Ground Temperature (°C)", "Perimeter (m)", "Insulated"]  # NEW: Added Insulated
             template_data = pd.DataFrame(columns=required_cols)
-            template_data.loc[0] = ["Example Floor", 10.0, 0.4, "Concrete Slab", "Yes", 25.0, 12.0]  # NEW: Added perimeter in template
+            template_data.loc[0] = ["Example Floor", 10.0, 0.4, "Concrete Slab", "Yes", 25.0, 12.0, "No"]
             st.download_button(label="Download Floor Template", data=template_data.to_csv(index=False), file_name="floor_template.csv", mime="text/csv")
             if uploaded_file:
                 df = pd.read_csv(uploaded_file) if uploaded_file.name.endswith('.csv') else pd.read_excel(uploaded_file)
                 if all(col in df.columns for col in required_cols):
                     for _, row in df.iterrows():
                         try:
+                            insulated = str(row["Insulated"]).lower() in ["yes", "true", "1"]
                             new_floor = Floor(
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 floor_type=str(row["Floor Type"]), ground_contact=(str(row["Ground Contact"]).lower() == "yes"),
-                                ground_temperature_c=float(row["Ground Temperature (°C)"]), perimeter=float(row["Perimeter (m)"])  # NEW: Read perimeter
+                                ground_temperature_c=float(row["Ground Temperature (°C)"]), perimeter=float(row["Perimeter (m)"]),
+                                insulated=insulated
                             )
                             self.component_library.add_component(new_floor)
                             session_state.components['floors'].append(new_floor)
@@ -689,7 +690,7 @@ class ComponentSelectionInterface:
             headers = {
                 ComponentType.WALL: ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Wall Type", "Wall Group", "Absorptivity", "Shading Coefficient", "Infiltration Rate (CFM)", "Delete"],
                 ComponentType.ROOF: ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Roof Type", "Roof Group", "Slope", "Absorptivity", "Delete"],
-                ComponentType.FLOOR: ["Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact", "Ground Temperature (°C)", "Perimeter (m)", "Delete"],  # NEW: Added Perimeter
+                ComponentType.FLOOR: ["Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact", "Ground Temperature (°C)", "Perimeter (m)", "Insulated", "Delete"],  # NEW: Added Insulated
                 ComponentType.WINDOW: ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "SHGC", "Shading Device", "Shading Coefficient", "Frame Type", "Frame Percentage", "Infiltration Rate (CFM)", "Delete"],
                 ComponentType.DOOR: ["Name", "Area (m²)", "U-Value (W/m²·K)", "Orientation", "Door Type", "Infiltration Rate (CFM)", "Delete"]
             }[component_type]
@@ -718,7 +719,8 @@ class ComponentSelectionInterface:
                     cols[4].write(comp.floor_type)
                     cols[5].write("Yes" if comp.ground_contact else "No")
                     cols[6].write(comp.ground_temperature_c if comp.ground_contact else "N/A")
-                    cols[7].write(comp.perimeter)  # NEW: Display perimeter
+                    cols[7].write(comp.perimeter)
+                    cols[8].write("Yes" if comp.insulated else "No")  # NEW: Display insulated
                 elif component_type == ComponentType.WINDOW:
                     cols[4].write(comp.shgc)
                     cols[5].write(comp.shading_device)