ifctrano 0.4.0__tar.gz → 0.7.0__tar.gz

{ifctrano-0.4.0 → ifctrano-0.7.0}/PKG-INFO

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: ifctrano
-Version: 0.4.0
+Version: 0.7.0
 Summary: Package for generating building energy simulation model from IFC
 License: GPL V3
+License-File: LICENSE
 Keywords: BIM,IFC,energy simulation,modelica,building energy simulation,buildings,ideas
 Author: Ando Andriamamonjy
 Author-email: andoludovic.andriamamonjy@gmail.com
@@ -15,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: ifcopenshell (>=0.8.1.post1,<0.9.0)
 Requires-Dist: open3d (>=0.19.0,<0.20.0)
 Requires-Dist: shapely (>=2.0.7,<3.0.0)
-Requires-Dist: trano (>=0.6.0,<0.7.0)
+Requires-Dist: trano (>=0.10.0,<0.11.0)
 Requires-Dist: typer (>=0.12.5,<0.13.0)
 Requires-Dist: vedo (>=2025.5.3,<2026.0.0)
 Project-URL: Repository, https://github.com/andoludo/ifctrano

{ifctrano-0.4.0 → ifctrano-0.7.0}/ifctrano/base.py

@@ -398,6 +398,7 @@ class CommonSurface(BaseShow):
     main_vertices: FaceVertices
     common_vertices: FaceVertices
     exterior: bool = True
+    polygon: str
 
     def __hash__(self) -> int:
         return hash(

{ifctrano-0.4.0 → ifctrano-0.7.0}/ifctrano/bounding_box.py

@@ -78,6 +78,7 @@ class ExtendCommonSurface(CommonSurface):
             orientation=self.orientation,
             main_vertices=self.main_vertices,
             common_vertices=self.common_vertices,
+            polygon=self.polygon,
         )
 
 
@@ -137,6 +138,7 @@ class OrientedBoundingBox(BaseShow):
                                 common_vertices=projected_face_1.common_vertices(
                                     intersection
                                 ),
+                                polygon=intersection.wkt,
                             )
                         )
 

{ifctrano-0.4.0 → ifctrano-0.7.0}/ifctrano/building.py

@@ -1,3 +1,4 @@
+import logging
 import re
 from pathlib import Path
 from typing import List, Tuple, Any, Optional, Set
@@ -12,7 +13,11 @@ from trano.topology import Network  # type: ignore
 from vedo import Line  # type: ignore
 
 from ifctrano.base import BaseModelConfig, Libraries, Vector, BaseShow, CommonSurface
-from ifctrano.exceptions import IfcFileNotFoundError, NoIfcSpaceFoundError
+from ifctrano.exceptions import (
+    IfcFileNotFoundError,
+    NoIfcSpaceFoundError,
+    NoSpaceBoundariesError,
+)
 from ifctrano.space_boundary import (
     SpaceBoundaries,
     initialize_tree,
@@ -20,6 +25,8 @@ from ifctrano.space_boundary import (
 )
 from ifctrano.construction import Constructions, default_construction
 
+logger = logging.getLogger(__name__)
+
 
 def get_spaces(ifcopenshell_file: file) -> List[entity_instance]:
     return ifcopenshell_file.by_type("IfcSpace")
@@ -180,9 +187,18 @@ class Building(BaseShow):
             ]
         if not spaces:
             raise NoIfcSpaceFoundError("No IfcSpace found in the file.")
-        space_boundaries = [
-            SpaceBoundaries.from_space_entity(ifc_file, tree, space) for space in spaces
-        ]
+        space_boundaries = []
+        for space in spaces:
+            try:
+                space_boundaries.append(
+                    SpaceBoundaries.from_space_entity(ifc_file, tree, space)
+                )
+            except Exception as e:  # noqa: PERF203
+                logger.error(f"Cannot process space {space.id()}. Reason {e}")
+                continue
+        if not space_boundaries:
+            raise NoSpaceBoundariesError("No valid space boundaries found.")
+
         return cls(
             space_boundaries=space_boundaries,
             ifc_file=ifc_file,

{ifctrano-0.4.0 → ifctrano-0.7.0}/ifctrano/exceptions.py

@@ -18,6 +18,10 @@ class NoIfcSpaceFoundError(Exception):
     pass
 
 
+class NoSpaceBoundariesError(Exception):
+    pass
+
+
 class InvalidLibraryError(Exception):
     pass
 

{ifctrano-0.4.0 → ifctrano-0.7.0}/ifctrano/space_boundary.py

@@ -5,7 +5,8 @@ import ifcopenshell
 import ifcopenshell.geom
 import ifcopenshell.util.shape
 from ifcopenshell import entity_instance, file
-from pydantic import Field, BeforeValidator, BaseModel
+from pydantic import Field, BeforeValidator, BaseModel, ConfigDict
+from shapely import wkt  # type: ignore
 from trano.data_models.conversion import SpaceParameter  # type: ignore
 from trano.elements import Space as TranoSpace, ExternalWall, Window, BaseWall, ExternalDoor  # type: ignore
 from trano.elements.system import Occupancy  # type: ignore
@@ -340,4 +341,109 @@ class SpaceBoundaries(BaseShow):
             )
             if space_boundary:
                 space_boundaries.append(space_boundary)
-        return cls(space=space_, boundaries=space_boundaries)
+        merged_boundaries = MergedSpaceBoundaries.from_boundaries(space_boundaries)
+        space_boundaries_ = merged_boundaries.merge_boundaries_from_part()
+        space_boundaries__ = remove_duplicate_boundaries(space_boundaries_)
+        return cls(space=space_, boundaries=space_boundaries__)
+
+
+def remove_duplicate_boundaries(
+    boundaries: List[SpaceBoundary],
+) -> List[SpaceBoundary]:
+    types = ["IfcRoof", "IfcSlab"]
+    boundaries = sorted(boundaries, key=lambda b: b.entity.GlobalId)
+    boundaries_without_types = [
+        sp for sp in boundaries if sp.entity.is_a() not in types
+    ]
+    new_boundaries = []
+    for type_ in types:
+        references = [sp for sp in boundaries if sp.entity.is_a() == type_]
+        while True:
+            reference = next(iter(references), None)
+            if not reference:
+                break
+            others = [p_ for p_ in references if p_ != reference]
+            intersecting = [
+                o
+                for o in others
+                if (
+                    wkt.loads(o.common_surface.polygon).intersects(
+                        wkt.loads(reference.common_surface.polygon)
+                    )
+                    and o.common_surface.orientation
+                    == reference.common_surface.orientation
+                )
+                and (
+                    wkt.loads(o.common_surface.polygon).intersection(
+                        wkt.loads(reference.common_surface.polygon)
+                    )
+                ).area
+                > 0
+            ]
+            current_group = sorted(
+                [*intersecting, reference], key=lambda p: p.entity.GlobalId
+            )
+            new_boundaries.append(next(iter(current_group)))
+            references = [p_ for p_ in references if p_ not in current_group]
+    return [*boundaries_without_types, *new_boundaries]
+
+
+class MergedSpaceBoundary(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+    parent: entity_instance
+    related_boundaries: List[SpaceBoundary]
+
+    def get_new_boundary(self) -> Optional[SpaceBoundary]:
+        related_boundaries = sorted(
+            self.related_boundaries, key=lambda b: b.entity.GlobalId
+        )
+        boundary = next(iter(related_boundaries), None)
+        if boundary:
+            return SpaceBoundary.model_validate(
+                boundary.model_dump() | {"entity": self.parent}
+            )
+        return None
+
+
+class MergedSpaceBoundaries(BaseModel):
+    part_boundaries: List[MergedSpaceBoundary]
+    original_boundaries: List[SpaceBoundary]
+
+    @classmethod
+    def from_boundaries(
+        cls, space_boundaries: List[SpaceBoundary]
+    ) -> "MergedSpaceBoundaries":
+        building_element_part_boundaries = [
+            boundary
+            for boundary in space_boundaries
+            if boundary.entity.is_a() in ["IfcBuildingElementPart"]
+        ]
+        existing_parent_entities = {
+            decompose.RelatingObject
+            for b in building_element_part_boundaries
+            for decompose in b.entity.Decomposes
+        }
+        part_boundaries = [
+            MergedSpaceBoundary(
+                parent=parent,
+                related_boundaries=[
+                    b
+                    for b in building_element_part_boundaries
+                    for decompose in b.entity.Decomposes
+                    if decompose.RelatingObject == parent
+                ],
+            )
+            for parent in existing_parent_entities
+        ]
+        return cls(
+            part_boundaries=part_boundaries, original_boundaries=space_boundaries
+        )
+
+    def merge_boundaries_from_part(self) -> List[SpaceBoundary]:
+        new_boundaries = [b.get_new_boundary() for b in self.part_boundaries]
+        new_boundaries_ = [nb for nb in new_boundaries if nb is not None]
+        return [
+            b
+            for b in self.original_boundaries
+            if b.entity.is_a() not in ["IfcBuildingElementPart"]
+        ] + new_boundaries_

ifctrano-0.7.0/ifctrano/types.py

@@ -0,0 +1,11 @@
+from typing import Literal
+
+BuildingElements = Literal[
+    "IfcWall",
+    "IfcSlab",
+    "IfcRoof",
+    "IfcDoor",
+    "IfcWindow",
+    "IfcPlate",
+    "IfcBuildingElementPart",
+]

{ifctrano-0.4.0 → ifctrano-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ifctrano"
-version = "0.4.0"
+version = "0.7.0"
 description = "Package for generating building energy simulation model from IFC"
 authors = ["Ando Andriamamonjy <andoludovic.andriamamonjy@gmail.com>"]
 license = "GPL V3"
@@ -11,7 +11,7 @@ keywords = ["BIM","IFC","energy simulation", "modelica", "building energy simula
 [tool.poetry.dependencies]
 python = ">=3.10,<3.13"
 ifcopenshell = "^0.8.1.post1"
-trano = "^0.6.0"
+trano = "^0.10.0"
 shapely = "^2.0.7"
 typer = "^0.12.5"
 vedo = "^2025.5.3"

ifctrano-0.4.0/ifctrano/types.py

@@ -1,5 +0,0 @@
-from typing import Literal
-
-BuildingElements = Literal[
-    "IfcWall", "IfcSlab", "IfcRoof", "IfcDoor", "IfcWindow", "IfcPlate"
-]