Update app/component_selection.py

app/component_selection.py

@@ -2,6 +2,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.
 """
 
 import streamlit as st
@@ -125,16 +126,22 @@ 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
 
     def __post_init__(self):
         super().__post_init__()
         self.component_type = ComponentType.FLOOR
         self.orientation = Orientation.NOT_APPLICABLE
+        if self.perimeter < 0:
+            raise ValueError("Perimeter cannot be negative")
+        if self.ground_contact and not (-10 <= self.ground_temperature_c <= 40):
+            raise ValueError("Ground temperature must be between -10°C and 40°C for ground-contact floors")
 
     def to_dict(self) -> dict:
         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
+            "floor_type": self.floor_type, "ground_contact": self.ground_contact,
+            "ground_temperature_c": self.ground_temperature_c, "perimeter": self.perimeter
         })
         return base_dict
 
@@ -425,7 +432,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)", ["1", "2", "3", "4", "5", "6", "7", "8"], index=0)
+                    roof_group = st.selectbox("Roof Group (ASHRAE)", ["A", "B", "C", "D", "E", "F", "G"], index=0)  # Updated to letter-based groups
                     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)
 
@@ -453,18 +460,18 @@ class ComponentSelectionInterface:
             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", "1", "Flat", 0.6]
+            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")
             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):
-                    valid_roof_groups = {"1", "2", "3", "4", "5", "6", "7", "8"}
+                    valid_roof_groups = {"A", "B", "C", "D", "E", "F", "G"}
                     for _, row in df.iterrows():
                         try:
                             roof_group = str(row["Roof Group"])
                             if roof_group not in valid_roof_groups:
-                                st.warning(f"Invalid Roof Group '{roof_group}' in row '{row['Name']}'. Defaulting to '1'.")
-                                roof_group = "1"
+                                st.warning(f"Invalid Roof Group '{roof_group}' in row '{row['Name']}'. Defaulting to 'A'.")
+                                roof_group = "A"
                             new_roof = Roof(
                                 name=str(row["Name"]), u_value=float(row["U-Value (W/m²·K)"]), area=float(row["Area (m²)"]),
                                 orientation=Orientation(row["Orientation"]), roof_type=str(row["Roof Type"]),
@@ -491,19 +498,21 @@ 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
                 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)", value=25.0, step=0.1) if ground_contact == "Yes" else 25.0
+                    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
 
                 submitted = st.form_submit_button("Add Floor")
                 if submitted and not session_state.add_floor_submitted:
                     try:
                         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
+                            ground_contact=(ground_contact == "Yes"), ground_temperature_c=ground_temp,
+                            perimeter=perimeter  # NEW: Pass perimeter
                         )
                         self.component_library.add_component(new_floor)
                         session_state.components['floors'].append(new_floor)
@@ -518,8 +527,10 @@ 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)"]
-            st.download_button(label="Download Floor Template", data=pd.DataFrame(columns=required_cols).to_csv(index=False), file_name="floor_template.csv", mime="text/csv")
+            required_cols = ["Name", "Area (m²)", "U-Value (W/m²·K)", "Floor Type", "Ground Contact", "Ground Temperature (°C)", "Perimeter (m)"]  # NEW: Added Perimeter
+            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
+            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):
@@ -528,7 +539,7 @@ class ComponentSelectionInterface:
                             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)"])
+                                ground_temperature_c=float(row["Ground Temperature (°C)"]), perimeter=float(row["Perimeter (m)"])  # NEW: Read perimeter
                             )
                             self.component_library.add_component(new_floor)
                             session_state.components['floors'].append(new_floor)
@@ -678,7 +689,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)", "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.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]
@@ -707,6 +718,7 @@ 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
                 elif component_type == ComponentType.WINDOW:
                     cols[4].write(comp.shgc)
                     cols[5].write(comp.shading_device)