fix function for connecting equipment

Author: Crowder44

src/bim2fem/ifcplus/api/distribution_element.py

@@ -13,7 +13,7 @@
 import ifcopenshell.api.type
 import numpy as np
 import ifcopenshell.util.representation
-from typing import Literal
+from typing import Literal, cast
 import ifcopenshell.api.system
 import ifcopenshell.api.root
 import ifcopenshell.api.spatial
@@ -26,7 +26,6 @@
 import numpy as np
 import bim2fem.ifcplus.api.system
 import ifcopenshell.util.representation
-import bim2fem.ifcplus.api.material
 
 
 ELBOW_RADIUS_TYPE = Literal["LONG", "SHORT"]
@@ -37,7 +36,7 @@ def create_elbow(
     horizontal_curve: bim2fem.ifcplus.util.geometry.HorizontalCurve,
     nominal_diameter: float,
     thickness: float,
-    material: ifcopenshell.entity_instance | None = None,
+    material: ifcopenshell.entity_instance,
     elbow: ifcopenshell.entity_instance | None = None,
     name: str | None = None,
     spatial_element: ifcopenshell.entity_instance | None = None,
@@ -93,13 +92,12 @@ def create_elbow(
     representation_type = ifcopenshell.util.representation.guess_type(
         items=[revolved_area_solid]
     )
-    assert isinstance(representation_type, str)
 
     shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(
         ifc4_file=ifc4_file,
         shape_model_class="IfcShapeRepresentation",
         representation_identifier="Body",
-        representation_type=representation_type,
+        representation_type=cast(str, representation_type),
         items=[revolved_area_solid],
     )
     ifcopenshell.api.geometry.assign_representation(
@@ -128,18 +126,6 @@ def create_elbow(
         place_object_relative_to_parent=place_object_relative_to_parent,
     )
 
-    if material is None:
-        material = bim2fem.ifcplus.api.material.add_material_with_structural_properties(
-            ifc4_file=ifc4_file,
-            name="Galvanized Steel",
-            category="steel",
-            mass_density=7850.0,
-            young_modulus=200.0e9,
-            poisson_ratio=0.3,
-            thermal_expansion_coefficient=1.2e-6,
-            check_for_duplicate=True,
-        )
-
     ifcopenshell.api.material.assign_material(
         file=ifc4_file,
         products=[elbow],
@@ -298,13 +284,12 @@ def create_pipe_segment(
     representation_type = ifcopenshell.util.representation.guess_type(
         items=[extruded_area_solid]
     )
-    assert isinstance(representation_type, str)
 
     shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(
         ifc4_file=ifc4_file,
         shape_model_class="IfcShapeRepresentation",
         representation_identifier="Body",
-        representation_type=representation_type,
+        representation_type=cast(str, representation_type),
         items=[extruded_area_solid],
     )
     ifcopenshell.api.geometry.assign_representation(
@@ -450,14 +435,15 @@ def create_make_up_air_unit(
         boolean_result_or_primitive=boolean_results[-1],
     )
 
-    representation_type = ifcopenshell.util.representation.guess_type(items=[csg_solid])
-    assert isinstance(representation_type, str)
+    representation_type = ifcopenshell.util.representation.guess_type(
+        items=[csg_solid],
+    )
 
     shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(
         ifc4_file=ifc4_file,
         shape_model_class="IfcShapeRepresentation",
         representation_identifier="Body",
-        representation_type=representation_type,
+        representation_type=cast(str, representation_type),
         items=[csg_solid],
     )
     ifcopenshell.api.geometry.assign_representation(
@@ -626,13 +612,12 @@ def create_air_filtration_containment_housing(
     )
 
     representation_type = ifcopenshell.util.representation.guess_type(items=[csg_solid])
-    assert isinstance(representation_type, str)
 
     shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(
         ifc4_file=ifc4_file,
         shape_model_class="IfcShapeRepresentation",
         representation_identifier="Body",
-        representation_type=representation_type,
+        representation_type=cast(str, representation_type),
         items=[csg_solid],
     )
     ifcopenshell.api.geometry.assign_representation(

src/bim2fem/ifcplus/api/system.py

@@ -101,9 +101,7 @@ def filter_out_colinear_points_from_polyline(
 ) -> list[tuple[float, float, float]]:
 
     def remove_items_by_indices(lst: list, indices: list) -> list:
-        # Convert indices to a set for faster lookup
         indices_set = set(indices)
-        # Use list comprehension to create a new list without the specified indices
         return [item for idx, item in enumerate(lst) if idx not in indices_set]
 
     if len(polyline) < 3:
@@ -145,6 +143,7 @@ def remove_items_by_indices(lst: list, indices: list) -> list:
 
 
 def create_piping_system_from_polyline(
+    ifc4_file: ifcopenshell.file,
     polyline: list[tuple[float, float, float]],
     nominal_diameter: float,
     thickness: float,
@@ -159,8 +158,6 @@ def create_piping_system_from_polyline(
     """Create a single path pipe branch composed of IfcPipeSegments and
     IfcPipeFittings (Elbows)."""
 
-    ifc4_file = material.file
-
     if len(polyline) < 2:
         return []
 
@@ -235,6 +232,7 @@ def create_piping_system_from_polyline(
         )
 
         elbow = bim2fem.ifcplus.api.distribution_element.create_elbow(
+            ifc4_file=ifc4_file,
             horizontal_curve=horizontal_curve,
             nominal_diameter=nominal_diameter,
             thickness=thickness,
@@ -283,6 +281,7 @@ def create_piping_system_from_polyline(
 
 
 def connect_two_distribution_ports_via_piping_with_no_intelligence(
+    ifc4_file: ifcopenshell.file,
     source_port: ifcopenshell.entity_instance,
     sink_port: ifcopenshell.entity_instance,
     nominal_diameter: float,
@@ -348,6 +347,7 @@ def connect_two_distribution_ports_via_piping_with_no_intelligence(
     )
 
     piping_elements = create_piping_system_from_polyline(
+        ifc4_file=ifc4_file,
         polyline=[
             source_port_origin,
             second_point,

tests/ifcplus/api/test_distribution_element.py

@@ -18,6 +18,7 @@
 from tests.conftest import OUTPUT_DIR_FOR_DISTRIBUTION_ELEMENT
 import bim2fem.ifcplus.util.geometry
 import numpy as np
+from typing import cast
 
 
 class TestAddEquipment:
@@ -151,12 +152,23 @@ def test_add_elbows(
             )
         )
 
+        material = bim2fem.ifcplus.api.material.add_material_with_structural_properties(
+            ifc4_file=ifc_file_with_ventilation_distribution_system,
+            name="Galvanized Steel",
+            category="steel",
+            mass_density=7850.0,
+            young_modulus=200.0e9,
+            poisson_ratio=0.3,
+            thermal_expansion_coefficient=1.2e-6,
+            check_for_duplicate=True,
+        )
+
         bim2fem.ifcplus.api.distribution_element.create_elbow(
             ifc4_file=ifc_file_with_ventilation_distribution_system,
             horizontal_curve=horizontal_curve_1,
             nominal_diameter=1.0,
             thickness=0.10,
-            material=None,
+            material=material,
             name="Elbow #1",
             spatial_element=site,
             distribution_system=distribution_system,
@@ -177,7 +189,7 @@ def test_add_elbows(
             horizontal_curve=horizontal_curve_2,
             nominal_diameter=1.0,
             thickness=0.10,
-            material=None,
+            material=material,
             name="Elbow #2",
             spatial_element=site,
             distribution_system=distribution_system,
@@ -198,7 +210,7 @@ def test_add_elbows(
             horizontal_curve=horizontal_curve_3,
             nominal_diameter=1.0,
             thickness=0.10,
-            material=None,
+            material=material,
             name="Elbow #3",
             spatial_element=site,
             distribution_system=distribution_system,
@@ -220,7 +232,7 @@ def test_add_elbows(
             horizontal_curve=horizontal_curve_4,
             nominal_diameter=1.0,
             thickness=0.10,
-            material=None,
+            material=material,
             name="Elbow #4",
             spatial_element=site,
             distribution_system=distribution_system,
@@ -241,7 +253,7 @@ def test_add_elbows(
             horizontal_curve=horizontal_curve_5,
             nominal_diameter=1.0,
             thickness=0.10,
-            material=None,
+            material=material,
             name="Elbow #5",
             spatial_element=site,
             distribution_system=distribution_system,
@@ -335,14 +347,13 @@ def test_connect_make_up_air_unit_and_hepa_filter_with_dumb_piping(
             )
         )
 
-        assert isinstance(steel_material, ifcopenshell.entity_instance)
-
         bim2fem.ifcplus.api.system.connect_two_distribution_ports_via_piping_with_no_intelligence(
+            ifc4_file=ifc_file_with_ventilation_distribution_system,
             source_port=mau_source_port,
             sink_port=hepa_sink_port,
             nominal_diameter=0.20,
             thickness=0.20 * 0.10,
-            material=steel_material,
+            material=cast(ifcopenshell.entity_instance, steel_material),
             distribution_system=distribution_system,
             elbow_radius_type="SHORT",
             branch_name="Branch #1",
@@ -437,15 +448,13 @@ def test_connect_make_up_air_unit_and_hepa_filter_using_ant_colony(
             )
         )
 
-        assert isinstance(steel_material, ifcopenshell.entity_instance)
-
         bim2fem.ifcplus.api.system.connect_two_distribution_ports_via_piping_using_ant_colony(
             source_port=mau_source_port,
             sink_port=hepa_sink_port,
             obstacle=None,
             nominal_diameter=0.20,
             thickness=0.20 * 0.10,
-            material=steel_material,
+            material=cast(ifcopenshell.entity_instance, steel_material),
             distribution_system=distribution_system,
             elbow_radius_type="SHORT",
             branch_name="Branch #1",
@@ -540,12 +549,11 @@ def test_connect_make_up_air_unit_and_hepa_filter_using_ant_colony_with_obstacle
         representation_type = ifcopenshell.util.representation.guess_type(
             items=[csg_solid]
         )
-        assert isinstance(representation_type, str)
         shape_model = bim2fem.ifcplus.api.geometry.add_shape_model(
             ifc4_file=ifc_file_with_ventilation_distribution_system,
             shape_model_class="IfcShapeRepresentation",
             representation_identifier="Body",
-            representation_type=representation_type,
+            representation_type=cast(str, representation_type),
             items=[csg_solid],
         )
         ifcopenshell.api.geometry.assign_representation(
@@ -596,15 +604,13 @@ def test_connect_make_up_air_unit_and_hepa_filter_using_ant_colony_with_obstacle
             )
         )
 
-        assert isinstance(steel_material, ifcopenshell.entity_instance)
-
         bim2fem.ifcplus.api.system.connect_two_distribution_ports_via_piping_using_ant_colony(
             source_port=mau_source_port,
             sink_port=hepa_sink_port,
             obstacle=obstacle,
             nominal_diameter=0.20,
             thickness=0.20 * 0.10,
-            material=steel_material,
+            material=cast(ifcopenshell.entity_instance, steel_material),
             distribution_system=distribution_system,
             elbow_radius_type="SHORT",
             branch_name="Branch #1",