honeybee-core 1.61.24__py2.py3-none-any.whl → 1.61.25__py2.py3-none-any.whl

honeybee/room.py

@@ -2325,29 +2325,55 @@ class Room(_BaseWithShade):
             A string with the message or a list with a dictionary if detailed is True.
         """
         # create Polygon2Ds from the floors of the rooms
-        polys = [
-            [(Polygon2D(Point2D(p.x, p.y) for p in flr.vertices), flr.geometry[0].z)
-             for flr in room.floors if flr.geometry.is_horizontal(tolerance)]
-            for room in rooms
-        ]
+        b_polys, h_polys = [], []
+        for room in rooms:
+            rb_polys, rh_polys = [], []
+            for flr in room.floors:
+                flr_geo = flr.geometry
+                if flr_geo.is_horizontal(tolerance):
+                    b_poly = Polygon2D(Point2D(p.x, p.y) for p in flr_geo.boundary)
+                    rb_polys.append((b_poly, flr_geo[0].z))
+                    if flr_geo.has_holes:
+                        h_poly = [Polygon2D(Point2D(p.x, p.y) for p in hole)
+                                  for hole in flr_geo.holes]
+                        rh_polys.append(h_poly)
+                    else:
+                        rh_polys.append(None)
+            b_polys.append(rb_polys)
+            h_polys.append(rh_polys)
 
         # find the number of overlaps across the Rooms
         msgs = []
-        for i, (room_1, polys_1) in enumerate(zip(rooms, polys)):
+        for i, (room_1, polys_1, hp1) in enumerate(zip(rooms, b_polys, h_polys)):
             overlap_rooms = []
             if len(polys_1) == 0:
                 continue
             try:
-                for room_2, polys_2 in zip(rooms[i + 1:], polys[i + 1:]):
+                zip_obj = zip(rooms[i + 1:], b_polys[i + 1:], h_polys[i + 1:])
+                for room_2, polys_2, hp2 in zip_obj:
                     collision_found = False
-                    for ply_1, z1 in polys_1:
+                    for j, (ply_1, z1) in enumerate(polys_1):
                         if collision_found:
                             break
-                        for ply_2, z2 in polys_2:
+                        for k, (ply_2, z2) in enumerate(polys_2):
                             if collision_found:
                                 break
-                            if abs(z1 - z2) < tolerance:
-                                if ply_1.polygon_relationship(ply_2, tolerance) >= 0:
+                            if abs(z1 - z2) < tolerance and \
+                                    ply_1.polygon_relationship(ply_2, tolerance) >= 0:
+                                # check that one room is not inside the hole of another
+                                inside_hole = False
+                                if hp1[j] is not None:
+                                    for h in hp1[j]:
+                                        if h.polygon_relationship(ply_2, tolerance) == 1:
+                                            inside_hole = True
+                                            break
+                                if not inside_hole and hp2[k] is not None:
+                                    for h in hp2[k]:
+                                        if h.polygon_relationship(ply_1, tolerance) == 1:
+                                            inside_hole = True
+                                            break
+                                # if the room is not in a hole, then they overlap
+                                if not inside_hole:
                                     overlap_rooms.append(room_2)
                                     collision_found = True
                                     break

{honeybee_core-1.61.24.dist-info → honeybee_core-1.61.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.24
+Version: 1.61.25
 Summary: A library to create 3D building geometry for various types of environmental simulation.
 Home-page: https://github.com/ladybug-tools/honeybee-core
 Author: Ladybug Tools

{honeybee_core-1.61.24.dist-info → honeybee_core-1.61.25.dist-info}/RECORD

@@ -19,7 +19,7 @@ honeybee/logutil.py,sha256=2gn-6RcWqFLvwdFzBHPqUwFqTj_R3iwHKALrl-2eL7M,2564
 honeybee/model.py,sha256=RZhj195_Nr5jlUauEOo7H5ZdNZDdKyBb2kwhDxRB1oI,175099
 honeybee/orientation.py,sha256=GogGblASW9OU-fobfDaQ7w5yRbEAFdJJuHwg2fadhKI,5046
 honeybee/properties.py,sha256=fnlT71in22HpFQGD8ta5kXNnSZVXwXq5cNgvD-hrMRg,33462
-honeybee/room.py,sha256=Ga91VmqBTJqYyCY5bX5kHnf3zMe9reG-tHqFOTeWdSc,148639
+honeybee/room.py,sha256=lZZR_ZIpu3ZatnlRSZe4mjirkfJo8FCwRQmgsuR-6d8,150193
 honeybee/search.py,sha256=OiXibGGVb1ff4gTn_768i-sehB-zAYG12c0o3B0RjKE,4718
 honeybee/shade.py,sha256=G_ujmsPQeKvcc0O1ICiFRhVkjypkKBbgY9wJKck-9uU,19393
 honeybee/shademesh.py,sha256=oldugnwhu-ibX9f0hfxpO-DvgM8U7S-dYwUjBSVzo4g,13273
@@ -40,9 +40,9 @@ honeybee/writer/model.py,sha256=N7F_jksf-5TrdVecuxTaFWxnPVFLmQs7k8g27TsdB7Q,177
 honeybee/writer/room.py,sha256=kFghgStTU1SEJSLigXB0VjOWhZtgs4uXuAqdwd4yRQo,174
 honeybee/writer/shade.py,sha256=EpgX-vMc-s21TnMvNWvWTKyT8iAnxu1nFVXzjY1oyF8,177
 honeybee/writer/shademesh.py,sha256=Y41bLogJ7dwpvMe5cAWVRDRVqJEwo9e5hFJQjlt6UX8,189
-honeybee_core-1.61.24.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_core-1.61.24.dist-info/METADATA,sha256=S0Yt3Q43hUt4OJzNU9IPynJF5X4Boxj0JJbxkcVQ8fA,3317
-honeybee_core-1.61.24.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_core-1.61.24.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
-honeybee_core-1.61.24.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
-honeybee_core-1.61.24.dist-info/RECORD,,
+honeybee_core-1.61.25.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_core-1.61.25.dist-info/METADATA,sha256=a747oDPQMZlU9flnMa9Oi6Gr9DnJhG44FRdk9hDaTTw,3317
+honeybee_core-1.61.25.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_core-1.61.25.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
+honeybee_core-1.61.25.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
+honeybee_core-1.61.25.dist-info/RECORD,,