remove unnecessary actions that convert numpy floats to regular floats

Author: Crowder44

src/bim2fem/ifcplus/api/distribution_element.py

@@ -241,18 +241,6 @@ def create_pipe_segment(
         object_z_axis_in_global_coordinates,
     )
 
-    object_z_axis_in_global_coordinates = (
-        bim2fem.ifcplus.util.geometry.convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=object_z_axis_in_global_coordinates,
-        )
-    )
-
-    object_x_axis_in_global_coordinates = (
-        bim2fem.ifcplus.util.geometry.convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=object_x_axis_in_global_coordinates,
-        )
-    )
-
     length = float(np.linalg.norm(object_z_axis_in_global_coordinates))
 
     outer_radius = nominal_diameter / 2 + thickness / 2
@@ -291,8 +279,8 @@ def create_pipe_segment(
     bim2fem.ifcplus.api.placement.edit_object_placement(
         product=pipe_segment,
         repositioned_origin=object_origin_in_global_coordinates,
-        repositioned_z_axis=object_z_axis_in_global_coordinates,
-        repositioned_x_axis=object_x_axis_in_global_coordinates,
+        repositioned_z_axis=tuple(object_z_axis_in_global_coordinates.tolist()),
+        repositioned_x_axis=tuple(object_x_axis_in_global_coordinates.tolist()),
         place_object_relative_to_parent=place_object_relative_to_parent,
     )
 

src/bim2fem/ifcplus/api/system.py

@@ -298,7 +298,7 @@ def create_pipe_run_from_polyline(
     return piping_elements
 
 
-def connect_two_distribution_ports_via_piping_with_no_intelligence(
+def connect_two_distribution_ports_via_pipe_run(
     ifc4_file: ifcopenshell.file,
     source_port: ifcopenshell.entity_instance,
     sink_port: ifcopenshell.entity_instance,
@@ -311,7 +311,7 @@ def connect_two_distribution_ports_via_piping_with_no_intelligence(
     spatial_element: ifcopenshell.entity_instance | None = None,
     add_shape_representation_to_ports: bool = False,
 ) -> list[ifcopenshell.entity_instance]:
-    """Connect two IfcDistributionPorts using a single path pipe branch formed via no
+    """Connect two IfcDistributionPorts using a pipe run formed via no
     intelligent method."""
 
     source_port_origin = bim2fem.ifcplus.util.system.get_port_location(
@@ -344,11 +344,13 @@ def connect_two_distribution_ports_via_piping_with_no_intelligence(
         ).tolist()
     )
 
-    (
-        delta_x_between_second_and_penultimate_point,
-        delta_y_between_second_and_penultimate_point,
-        _,
-    ) = tuple((np.array(penultimate_point) - np.array(second_point)).tolist())
+    delta_x_between_second_and_penultimate_point = (
+        np.array(penultimate_point) - np.array(second_point)
+    )[0]
+
+    delta_y_between_second_and_penultimate_point = (
+        np.array(penultimate_point) - np.array(second_point)
+    )[1]
 
     third_point = tuple(
         (

src/bim2fem/ifcplus/util/geometry.py

@@ -651,19 +651,11 @@ def from_3pt_polyline(
             - np.array(unit_vector_from_PC_to_PI) * tangent_length
         )
 
-        point_of_curvature = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_curvature
-        )
-
         point_of_tangency = (
             np.array(point_of_intersection)
             + np.array(unit_vector_from_PI_to_PT) * tangent_length
         )
 
-        point_of_tangency = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_tangency
-        )
-
         unit_vector_from_PC_to_CC = calculate_cross_product_of_two_vectors(
             vector1=axis_of_rotation,
             vector2=unit_vector_from_PC_to_PI,
@@ -674,18 +666,14 @@ def from_3pt_polyline(
             + np.array(unit_vector_from_PC_to_CC) * radius_of_curvature
         )
 
-        center_of_curvature = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=center_of_curvature
-        )
-
         return cls(
             point_of_intersection=point_of_intersection,
             central_angle=float(central_angle),
             radius_of_curvature=float(radius_of_curvature),
             direction_of_axis_of_rotation=axis_of_rotation,
-            point_of_curvature=point_of_curvature,
-            point_of_tangency=point_of_tangency,
-            center_of_curvature=center_of_curvature,
+            point_of_curvature=tuple(point_of_curvature.tolist()),
+            point_of_tangency=tuple(point_of_tangency.tolist()),
+            center_of_curvature=tuple(center_of_curvature.tolist()),
         )
 
     @classmethod
@@ -736,18 +724,14 @@ def from_PC_and_PT_and_PI(
             + np.array(unit_vector_from_PC_to_CC) * radius_of_curvature
         )
 
-        center_of_curvature = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=center_of_curvature
-        )
-
         return cls(
             point_of_intersection=point_of_intersection,
             central_angle=float(central_angle_of_curvature),
             radius_of_curvature=float(radius_of_curvature),
             direction_of_axis_of_rotation=axis_of_rotation,
             point_of_curvature=point_of_curvature,
             point_of_tangency=point_of_tangency,
-            center_of_curvature=center_of_curvature,
+            center_of_curvature=tuple(center_of_curvature.tolist()),
         )
 
     @classmethod
@@ -801,14 +785,10 @@ def from_PC_and_PT_and_CC(
             * np.array(unit_vector_from_from_CC_to_PI)
         )
 
-        point_of_intersection = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_intersection,
-        )
-
         return cls.from_PC_and_PT_and_PI(
             point_of_curvature=point_of_curvature,
             point_of_tangency=point_of_tangency,
-            point_of_intersection=point_of_intersection,
+            point_of_intersection=tuple(point_of_intersection.tolist()),
         )
 
     @classmethod
@@ -846,13 +826,9 @@ def from_PC_and_CC_and_angle(
             rotated_vector
         )
 
-        point_of_tangency = convert_3pt_ndarray_to_tuple_of_floats(
-            numpy_3pt_array=point_of_tangency
-        )
-
         return cls.from_PC_and_PT_and_CC(
             point_of_curvature=point_of_curvature,
-            point_of_tangency=point_of_tangency,
+            point_of_tangency=tuple(point_of_tangency.tolist()),
             point_on_center_of_curvature_side=point_of_center_of_curvature,
             radius_of_curvature=radius_of_curvature,
         )
@@ -900,11 +876,7 @@ def rotate_vector_about_axis(
         v * cos_angle + np.cross(k, v) * sin_angle + k * np.dot(k, v) * (1 - cos_angle)
     )
 
-    rotated_vector = convert_3pt_ndarray_to_tuple_of_floats(
-        numpy_3pt_array=rotated_vector
-    )
-
-    return rotated_vector
+    return tuple(rotated_vector.tolist())
 
 
 def calculate_endpoint_coordinates_of_shortest_line_connecting_two_lines(

tests/ifcplus/api/test_distribution_element.py

@@ -3,22 +3,13 @@
 import ifcopenshell
 import ifcopenshell.validate
 import bim2fem.ifcplus.api.project
-import bim2fem.ifcplus.api.system
 import bim2fem.ifcplus.util.geometry
 import bim2fem.ifcplus.api.placement
 import bim2fem.ifcplus.api.distribution_element
-import ifcopenshell.util.system
 import bim2fem.ifcplus.api.material
-import ifcopenshell.api.root
-import ifcopenshell.api.spatial
-import ifcopenshell.api.geometry
-import bim2fem.ifcplus.api.geometry
-import ifcopenshell.util.representation
-import pytest
 from tests.conftest import OUTPUT_DIR_FOR_DISTRIBUTION_ELEMENT
 import bim2fem.ifcplus.util.geometry
 import numpy as np
-from typing import cast
 
 
 class TestCreatePipingElements:

tests/ifcplus/api/test_system.py

@@ -154,7 +154,7 @@ def test_connect_make_up_air_unit_and_hepa_filter_with_pipe_run(
             )
         )
 
-        bim2fem.ifcplus.api.system.connect_two_distribution_ports_via_piping_with_no_intelligence(
+        bim2fem.ifcplus.api.system.connect_two_distribution_ports_via_pipe_run(
             ifc4_file=ifc_file_with_ventilation_distribution_system,
             source_port=mau_source_port,
             sink_port=hepa_sink_port,