honeybee-core 1.61.31__py2.py3-none-any.whl → 1.61.33__py2.py3-none-any.whl

honeybee/model.py

@@ -181,7 +181,7 @@ class Model(_Base):
             rooms = []
             for r in data['rooms']:
                 try:
-                    rooms.append(Room.from_dict(r, tol, angle_tol))
+                    rooms.append(Room.from_dict(r, tol))
                 except Exception as e:
                     invalid_dict_error(r, e)
         orphaned_faces = None  # import orphaned faces
@@ -2239,7 +2239,7 @@ class Model(_Base):
         msgs.append(self.check_sub_faces_valid(tol, ang_tol, False, detailed))
         msgs.append(self.check_sub_faces_overlapping(tol, False, detailed))
         msgs.append(self.check_upside_down_faces(ang_tol, False, detailed))
-        msgs.append(self.check_rooms_solid(tol, ang_tol, False, detailed))
+        msgs.append(self.check_rooms_solid(tol, raise_exception=False, detailed=detailed))
 
         # perform checks related to adjacency relationships
         msgs.append(self.check_room_volume_collisions(tol, False, detailed))
@@ -2619,9 +2619,7 @@ class Model(_Base):
             tolerance: tolerance: The maximum difference between x, y, and z values
                 at which face vertices are considered equivalent. If None, the Model
                 tolerance will be used. (Default: None).
-            angle_tolerance: The max angle difference in degrees that vertices are
-                allowed to differ from one another in order to consider them colinear.
-                If None, the Model angle_tolerance will be used. (Default: None).
+            angle_tolerance: Deprecated input that is no longer used.
             raise_exception: Boolean to note whether a ValueError should be raised
                 if the room geometry does not form a closed solid. (Default: True).
             detailed: Boolean for whether the returned object is a detailed list of
@@ -2631,12 +2629,10 @@ class Model(_Base):
             A string with the message or a list with a dictionary if detailed is True.
         """
         tolerance = self.tolerance if tolerance is None else tolerance
-        angle_tolerance = self.angle_tolerance \
-            if angle_tolerance is None else angle_tolerance
         detailed = False if raise_exception else detailed
         msgs = []
         for room in self._rooms:
-            msg = room.check_solid(tolerance, angle_tolerance, False, detailed)
+            msg = room.check_solid(tolerance, raise_exception=False, detailed=detailed)
             if detailed:
                 msgs.extend(msg)
             elif msg != '':

honeybee/room.py

@@ -47,10 +47,7 @@ class Room(_BaseWithShade):
             used in determining whether the faces form a closed volume. Default
             is 0, which makes no attempt to evaluate whether the Room volume
             is closed.
-        angle_tolerance: The max angle difference in degrees that vertices are
-            allowed to differ from one another in order to consider them colinear.
-            Default is 0, which makes no attempt to evaluate whether the Room
-            volume is closed.
+        angle_tolerance: Deprecated input that is no longer used.
 
     Properties:
         * identifier
@@ -89,7 +86,7 @@ class Room(_BaseWithShade):
         '_exclude_floor_area',
         '_parent')
 
-    def __init__(self, identifier, faces, tolerance=0, angle_tolerance=0):
+    def __init__(self, identifier, faces, tolerance=0, angle_tolerance=None):
         """Initialize Room."""
         _BaseWithShade.__init__(self, identifier)  # process the identifier
 
@@ -108,9 +105,8 @@ class Room(_BaseWithShade):
             # try to get a closed volume between the faces
             room_polyface = Polyface3D.from_faces(
                 tuple(face.geometry for face in faces), tolerance)
-            if not room_polyface.is_solid and angle_tolerance != 0:
-                ang_tol = math.radians(angle_tolerance)
-                room_polyface = room_polyface.merge_overlapping_edges(tolerance, ang_tol)
+            if not room_polyface.is_solid:
+                room_polyface = room_polyface.merge_overlapping_edges(tolerance)
             # replace honeybee face geometry with versions that are facing outwards
             if room_polyface.is_solid:
                 for i, correct_face3d in enumerate(room_polyface.faces):
@@ -134,7 +130,7 @@ class Room(_BaseWithShade):
         self._properties = RoomProperties(self)  # properties for extensions
 
     @classmethod
-    def from_dict(cls, data, tolerance=0, angle_tolerance=0):
+    def from_dict(cls, data, tolerance=0, angle_tolerance=None):
         """Initialize an Room from a dictionary.
 
         Args:
@@ -144,10 +140,7 @@ class Room(_BaseWithShade):
                 used in determining whether the faces form a closed volume. Default
                 is 0, which makes no attempt to evaluate whether the Room volume
                 is closed.
-            angle_tolerance: The max angle difference in degrees that vertices are
-                allowed to differ from one another in order to consider them colinear.
-                Default is 0, which makes no attempt to evaluate whether the Room
-                volume is closed.
+            angle_tolerance: Deprecated input that is no longer used.
         """
         try:
             # check the type of dictionary
@@ -161,7 +154,7 @@ class Room(_BaseWithShade):
                     faces.append(Face.from_dict(f_dict))
                 except Exception as e:
                     invalid_dict_error(f_dict, e)
-            room = cls(data['identifier'], faces, tolerance, angle_tolerance)
+            room = cls(data['identifier'], faces, tolerance)
             if 'display_name' in data and data['display_name'] is not None:
                 room.display_name = data['display_name']
             if 'user_data' in data and data['user_data'] is not None:
@@ -1265,7 +1258,8 @@ class Room(_BaseWithShade):
                 suitable for objects in meters.
             angle_tolerance: The max angle in degrees that the plane normals can
                 differ from one another in order for them to be considered
-                coplanar. (Default: 1 degree).
+                coplanar. This is used to reassign sub-faces to split room
+                geometry. (Default: 1 degree).
 
         Returns:
             A list containing only the new Faces that were created as part of the
@@ -1329,7 +1323,7 @@ class Room(_BaseWithShade):
         room_polyface = Polyface3D.from_faces(
             tuple(face.geometry for face in all_faces), tolerance)
         if not room_polyface.is_solid:
-            room_polyface = room_polyface.merge_overlapping_edges(tolerance, ang_tol)
+            room_polyface = room_polyface.merge_overlapping_edges(tolerance)
         # replace honeybee face geometry with versions that are facing outwards
         if room_polyface.is_solid:
             for i, correct_face3d in enumerate(room_polyface.faces):
@@ -1376,7 +1370,7 @@ class Room(_BaseWithShade):
             return False
         return True
 
-    def check_solid(self, tolerance=0.01, angle_tolerance=1, raise_exception=True,
+    def check_solid(self, tolerance=0.01, angle_tolerance=None, raise_exception=True,
                     detailed=False):
         """Check whether the Room is a closed solid to within the input tolerances.
 
@@ -1384,9 +1378,7 @@ class Room(_BaseWithShade):
             tolerance: tolerance: The maximum difference between x, y, and z values
                 at which face vertices are considered equivalent. Default: 0.01,
                 suitable for objects in meters.
-            angle_tolerance: The max angle difference in degrees that vertices are
-                allowed to differ from one another in order to consider them colinear.
-                Default: 1 degree.
+            angle_tolerance: Deprecated input that is no longer used.
             raise_exception: Boolean to note whether a ValueError should be raised
                 if the room geometry does not form a closed solid.
             detailed: Boolean for whether the returned object is a detailed list of
@@ -1401,13 +1393,12 @@ class Room(_BaseWithShade):
         self._geometry = Polyface3D.from_faces(face_geometries, tolerance)
         if self.geometry.is_solid:
             return [] if detailed else ''
-        ang_tol = math.radians(angle_tolerance)
-        self._geometry = self.geometry.merge_overlapping_edges(tolerance, ang_tol)
+        self._geometry = self.geometry.merge_overlapping_edges(tolerance)
         if self.geometry.is_solid:
             return [] if detailed else ''
-        msg = 'Room "{}" is not closed to within {} tolerance and {} angle ' \
-            'tolerance.\n  {} naked edges found\n  {} non-manifold edges found'.format(
-                self.full_id, tolerance, angle_tolerance,
+        msg = 'Room "{}" is not closed to within {} tolerance.' \
+            '\n  {} naked edges found\n  {} non-manifold edges found'.format(
+                self.full_id, tolerance,
                 len(self._geometry.naked_edges), len(self._geometry.non_manifold_edges))
         full_msg = self._validation_message(
             msg, raise_exception, detailed, '000106',
@@ -1671,6 +1662,44 @@ class Room(_BaseWithShade):
             msg, raise_exception, detailed, '000107',
             error_type='Degenerate Room Volume')
 
+    def remove_duplicate_faces(self, tolerance=0.01):
+        """Remove duplicate face geometries from the Room.
+
+        Such duplicate faces can sometimes happen as a result of performing many
+        coplanar splits.
+
+        Args:
+            tolerance: The minimum difference between the coordinate values of two
+                faces at which they can be considered adjacent. Default: 0.01,
+                suitable for objects in meters.
+
+        Returns:
+            A list containing only the duplicate Faces that were removed.
+        """
+        # first make a list of faces without any duplicate geometries
+        new_faces, removed_faces = [self._faces[0]], []
+        for face in self._faces[1:]:
+            for e_face in new_faces:
+                if face.geometry.is_centered_adjacent(e_face.geometry, tolerance):
+                    tol_area = math.sqrt(face.geometry.area) * tolerance
+                    if abs(face.geometry.area - e_face.area) < tol_area:
+                        removed_faces.append(face)
+                        break  # duplicate face found
+            else:  # the first face with this type of plane
+                new_faces.append(face)
+        if len(removed_faces) == 0:
+            return removed_faces  # nothing has been removed
+
+        # make a new polyface from the updated faces
+        room_polyface = Polyface3D.from_faces(
+            tuple(face.geometry for face in new_faces), tolerance)
+        if not room_polyface.is_solid:
+            room_polyface = room_polyface.merge_overlapping_edges(tolerance)
+        # reset the faces and geometry of the room with the new faces
+        self._faces = tuple(new_faces)
+        self._geometry = room_polyface
+        return removed_faces
+
     def merge_coplanar_faces(
             self, tolerance=0.01, angle_tolerance=1, orthogonal_only=False):
         """Merge coplanar Faces of this Room.
@@ -1786,7 +1815,7 @@ class Room(_BaseWithShade):
         room_polyface = Polyface3D.from_faces(
             tuple(face.geometry for face in all_faces), tolerance)
         if not room_polyface.is_solid:
-            room_polyface = room_polyface.merge_overlapping_edges(tolerance, a_tol)
+            room_polyface = room_polyface.merge_overlapping_edges(tolerance)
         # replace honeybee face geometry with versions that are facing outwards
         if room_polyface.is_solid:
             for i, correct_face3d in enumerate(room_polyface.faces):
@@ -1821,7 +1850,8 @@ class Room(_BaseWithShade):
                 suitable for objects in meters.
             angle_tolerance: The max angle in degrees that the plane normals can
                 differ from one another in order for them to be considered
-                coplanar. (Default: 1 degree).
+                coplanar. This is used to reassign sub-faces after the room
+                geometry is split. (Default: 1 degree).
 
         Returns:
             A list containing only the new Faces that were created as part of the
@@ -1900,7 +1930,7 @@ class Room(_BaseWithShade):
         room_polyface = Polyface3D.from_faces(
             tuple(face.geometry for face in all_faces), tolerance)
         if not room_polyface.is_solid:
-            room_polyface = room_polyface.merge_overlapping_edges(tolerance, ang_tol)
+            room_polyface = room_polyface.merge_overlapping_edges(tolerance)
         # replace honeybee face geometry with versions that are facing outwards
         if room_polyface.is_solid:
             for i, correct_face3d in enumerate(room_polyface.faces):
@@ -1949,6 +1979,7 @@ class Room(_BaseWithShade):
         for i, room in enumerate(rooms):
             other_rooms = room_geos[:i] + room_geos[i + 1:]
             room.coplanar_split(other_rooms, tolerance, angle_tolerance)
+            room.remove_duplicate_faces(tolerance)
 
     @staticmethod
     def solve_adjacency(rooms, tolerance=0.01, remove_mismatched_sub_faces=False):

{honeybee_core-1.61.31.dist-info → honeybee_core-1.61.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.31
+Version: 1.61.33
 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.31.dist-info → honeybee_core-1.61.33.dist-info}/RECORD

@@ -16,10 +16,10 @@ honeybee/extensionutil.py,sha256=DDQYhM7tFD3avRSCOjwTzLqX9ldUxl5GzY79V3_sATE,964
 honeybee/face.py,sha256=RTd5NGqV-RXHqLEpKpANXp9Wi2HcDRp2AtEbPy2pqmc,108049
 honeybee/facetype.py,sha256=vCtWZKHp21RH-Yzs8zsHJHuFhJvczNh0yFl8wDe_RWY,4489
 honeybee/logutil.py,sha256=2gn-6RcWqFLvwdFzBHPqUwFqTj_R3iwHKALrl-2eL7M,2564
-honeybee/model.py,sha256=ambWe1xR36gm5IE10l6At1K5OgVQGKht0xJb9MjeU_I,176146
+honeybee/model.py,sha256=oGuhSSBimZ-MEJKyidh6_poi7twUgeEJKUzbr_j7qcQ,175868
 honeybee/orientation.py,sha256=GogGblASW9OU-fobfDaQ7w5yRbEAFdJJuHwg2fadhKI,5046
 honeybee/properties.py,sha256=fnlT71in22HpFQGD8ta5kXNnSZVXwXq5cNgvD-hrMRg,33462
-honeybee/room.py,sha256=FbBaaxoG-ZlHjtIoLng49_9NTEu5nJPdhspmP_Kz4wE,151558
+honeybee/room.py,sha256=eVmfUv_9R0Tfkgcc2sKlJG60hEYZbpR6ZH20O7xK52k,152735
 honeybee/search.py,sha256=OiXibGGVb1ff4gTn_768i-sehB-zAYG12c0o3B0RjKE,4718
 honeybee/shade.py,sha256=GSlceN2kpo8NOc_QkvvxEhKozRytOS8InZ1Ge0fPuko,19746
 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.31.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_core-1.61.31.dist-info/METADATA,sha256=r5jx4vCztJb9wlAMfSdxNlBcToYkUiLZiO6fftco_mY,3317
-honeybee_core-1.61.31.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_core-1.61.31.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
-honeybee_core-1.61.31.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
-honeybee_core-1.61.31.dist-info/RECORD,,
+honeybee_core-1.61.33.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_core-1.61.33.dist-info/METADATA,sha256=AvK29igv9UAsKHY_yNvrQ7pU-yIO2UI-DNsRbslkwxw,3317
+honeybee_core-1.61.33.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_core-1.61.33.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
+honeybee_core-1.61.33.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
+honeybee_core-1.61.33.dist-info/RECORD,,