honeybee-core 1.61.17__py2.py3-none-any.whl → 1.61.19__py2.py3-none-any.whl

honeybee/aperture.py

@@ -818,6 +818,39 @@ class Aperture(_BaseWithShade):
             return full_msg
         return [] if detailed else ''
 
+    def check_degenerate(self, tolerance=0.01, raise_exception=True, detailed=False):
+        """Check whether the Aperture is degenerate with effectively zero area.
+
+        Note that, while the Aperture may have an area larger than the tolerance,
+        removing colinear vertices within the tolerance would create a geometry
+        smaller than the tolerance.
+
+        Args:
+            tolerance: The minimum difference between the coordinate values of two
+                vertices at which they can be considered equivalent. Default: 0.01,
+                suitable for objects in meters.
+            raise_exception: If True, a ValueError will be raised if the object
+                intersects with itself. Default: True.
+            detailed: Boolean for whether the returned object is a detailed list of
+                dicts with error info or a string with a message. (Default: False).
+
+        Returns:
+            A string with the message or a list with a dictionary if detailed is True.
+        """
+        msg = 'Aperture "{}" is degenerate and should be deleted.'.format(
+            self.full_id)
+        try:  # see if it is self-intersecting because of a duplicate vertex
+            new_geo = self.geometry.remove_colinear_vertices(tolerance)
+            if new_geo.area > tolerance:
+                return [] if detailed else ''  # valid
+        except AssertionError:
+            pass  # degenerate subface; treat it as degenerate
+        full_msg = self._validation_message(
+            msg, raise_exception, detailed, '000103',
+            error_type='Zero-Area Geometry')
+        return full_msg
+        return [] if detailed else ''
+
     def display_dict(self):
         """Get a list of DisplayFace3D dictionaries for visualizing the object."""
         base = [self._display_face(self.geometry, self.type_color)]

honeybee/door.py

@@ -575,6 +575,39 @@ class Door(_BaseWithShade):
             return full_msg
         return [] if detailed else ''
 
+    def check_degenerate(self, tolerance=0.01, raise_exception=True, detailed=False):
+        """Check whether the Door is degenerate with effectively zero area.
+
+        Note that, while the Door may have an area larger than the tolerance,
+        removing colinear vertices within the tolerance would create a geometry
+        smaller than the tolerance.
+
+        Args:
+            tolerance: The minimum difference between the coordinate values of two
+                vertices at which they can be considered equivalent. Default: 0.01,
+                suitable for objects in meters.
+            raise_exception: If True, a ValueError will be raised if the object
+                intersects with itself. Default: True.
+            detailed: Boolean for whether the returned object is a detailed list of
+                dicts with error info or a string with a message. (Default: False).
+
+        Returns:
+            A string with the message or a list with a dictionary if detailed is True.
+        """
+        msg = 'Door "{}" is degenerate and should be deleted.'.format(
+            self.full_id)
+        try:  # see if it is self-intersecting because of a duplicate vertex
+            new_geo = self.geometry.remove_colinear_vertices(tolerance)
+            if new_geo.area > tolerance:
+                return [] if detailed else ''  # valid
+        except AssertionError:
+            pass  # degenerate subface; treat it as degenerate
+        full_msg = self._validation_message(
+            msg, raise_exception, detailed, '000103',
+            error_type='Zero-Area Geometry')
+        return full_msg
+        return [] if detailed else ''
+
     def display_dict(self):
         """Get a list of DisplayFace3D dictionaries for visualizing the object."""
         base = [self._display_face(self.geometry, self.type_color)]

honeybee/face.py

@@ -130,6 +130,13 @@ class Face(_BaseWithShade):
             assert data['type'] == 'Face', 'Expected Face dictionary. ' \
                 'Got {}.'.format(data['type'])
 
+            # remove any invalid holes from the geometry
+            geo_dict = data['geometry']
+            if 'holes' in geo_dict and geo_dict['holes'] is not None:
+                for i, hole_list in enumerate(geo_dict['holes']):
+                    if len(hole_list) < 3:
+                        geo_dict['holes'].pop(i)
+
             # first serialize it with an outdoor boundary condition
             face_type = face_types.by_name(data['face_type'])
             face = cls(data['identifier'], Face3D.from_dict(data['geometry']),
@@ -2039,6 +2046,38 @@ class Face(_BaseWithShade):
             return full_msg
         return [] if detailed else ''
 
+    def check_degenerate(self, tolerance=0.01, raise_exception=True, detailed=False):
+        """Check whether the Face is degenerate with effectively zero area.
+
+        Note that, while the Face may have an area larger than the tolerance,
+        removing colinear vertices within the tolerance would create a geometry
+        smaller than the tolerance.
+
+        Args:
+            tolerance: The minimum difference between the coordinate values of two
+                vertices at which they can be considered equivalent. Default: 0.01,
+                suitable for objects in meters.
+            raise_exception: If True, a ValueError will be raised if the object
+                intersects with itself. Default: True.
+            detailed: Boolean for whether the returned object is a detailed list of
+                dicts with error info or a string with a message. (Default: False).
+
+        Returns:
+            A string with the message or a list with a dictionary if detailed is True.
+        """
+        msg = 'Face "{}" is degenerate and should be deleted.'.format(self.full_id)
+        try:  # see if it is self-intersecting because of a duplicate vertex
+            new_geo = self.geometry.remove_colinear_vertices(tolerance)
+            if new_geo.area > tolerance:
+                return [] if detailed else ''  # valid
+        except AssertionError:
+            pass  # degenerate face; treat it as degenerate
+        full_msg = self._validation_message(
+            msg, raise_exception, detailed, '000103',
+            error_type='Zero-Area Geometry')
+        return full_msg
+        return [] if detailed else ''
+
     def display_dict(self):
         """Get a list of DisplayFace3D dictionaries for visualizing the object."""
         base = [self._display_face(self.punched_geometry, self.type_color)]

honeybee/model.py

@@ -17,7 +17,8 @@ from ladybug_geometry.geometry3d import Plane, Face3D, Mesh3D
 from ladybug_geometry.interop.stl import STL
 
 from ._base import _Base
-from .units import conversion_factor_to_meters, UNITS, UNITS_TOLERANCES
+from .units import conversion_factor_to_meters, parse_distance_string, \
+    UNITS, UNITS_TOLERANCES
 from .checkdup import check_duplicate_identifiers, check_duplicate_identifiers_parent
 from .properties import ModelProperties
 from .room import Room
@@ -2200,6 +2201,7 @@ class Model(_Base):
             'Model must have a non-zero angle_tolerance to perform geometry checks.'
         tol = self.tolerance
         ang_tol = self.angle_tolerance
+        e_tol = parse_distance_string('1cm', self.units)
 
         # perform checks for duplicate identifiers, which might mess with other checks
         msgs.append(self.check_all_duplicate_identifiers(False, detailed))
@@ -2207,7 +2209,7 @@ class Model(_Base):
         # perform several checks for the Honeybee schema geometry rules
         msgs.append(self.check_planar(tol, False, detailed))
         msgs.append(self.check_self_intersecting(tol, False, detailed))
-        msgs.append(self.check_degenerate_rooms(tol, False, detailed))
+        msgs.append(self.check_degenerate_rooms(e_tol, False, detailed))
 
         # perform geometry checks related to parent-child relationships
         msgs.append(self.check_sub_faces_valid(tol, ang_tol, False, detailed))

honeybee/room.py

@@ -1155,7 +1155,7 @@ class Room(_BaseWithShade):
         """Remove colinear and duplicate vertices from this object's Faces and Sub-faces.
 
         If degenerate geometry is found in the process of removing colinear vertices,
-        an exception will be raised. Note that this does not affect the assigned Shades.
+        an exception will be raised unless delete_degenerate is True.
 
         Args:
             tolerance: The minimum distance between a vertex and the boundary segments
@@ -1628,13 +1628,19 @@ class Room(_BaseWithShade):
         """
         # if the room has the correct number of faces, test the envelope geometry
         if len(self._faces) >= 4 and self.volume > tolerance:
-            try:
-                test_room = self.duplicate()  # duplicate to avoid editing the original
-                test_room.remove_colinear_vertices_envelope(tolerance)
-            except ValueError as e:
-                deg_msg = str(e)
-                if raise_exception:
-                    raise ValueError(e)
+            msgs, final_faces = [], []
+            for face in self._faces:
+                face_msg = face.check_degenerate(tolerance, False, detailed)
+                if not face_msg:
+                    final_faces.append(face)
+                msgs.append(face_msg)
+                for ap in face._apertures:
+                    msgs.append(ap.check_degenerate(tolerance, False, detailed))
+                for dr in face._doors:
+                    msgs.append(dr.check_degenerate(tolerance, False, detailed))
+            if len(final_faces) < 4:
+                deg_msg = 'Room "{}" is degenerate with zero volume. ' \
+                    'It should be deleted'.format(self.full_id)
                 if detailed:
                     deg_msg = [{
                         'type': 'ValidationError',
@@ -1646,9 +1652,19 @@ class Room(_BaseWithShade):
                         'element_name': [self.display_name],
                         'message': deg_msg
                     }]
-                return deg_msg
-            return [] if detailed else ''
-        #  otherwise, report the room as invalid
+                msgs.append(deg_msg)
+            full_msgs = [msg for msg in msgs if msg]
+            if len(full_msgs) == 0:
+                return [] if detailed else ''
+            elif detailed:
+                return [m for megs in full_msgs for m in megs]
+            full_msg = 'Room "{}" contains degenerate geometry.' \
+                '\n  {}'.format(self.full_id, '\n  '.join(full_msgs))
+            if raise_exception and len(full_msgs) != 0:
+                raise ValueError(full_msg)
+            return full_msg
+
+        # otherwise, report the room as invalid
         msg = 'Room "{}" is degenerate with zero volume. It should be deleted'.format(
                 self.full_id)
         return self._validation_message(

{honeybee_core-1.61.17.dist-info → honeybee_core-1.61.19.dist-info}/METADATA

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

@@ -4,22 +4,22 @@ honeybee/_base.py,sha256=11TweR_0YJFv5ma1ttN2bs6FW_RlC3hNTjhhjvqXDB0,13181
 honeybee/_basewithshade.py,sha256=SXCWZ-4do6_Z-bZpVFidUINbylVyjwpkY2TIJE28Vuw,12943
 honeybee/_lockable.py,sha256=jmTVsXEWmYyEHpL3WsQZ_ItGOVVlJht1z3NFn07DIp0,3707
 honeybee/altnumber.py,sha256=nVXIvji9YDpy_I37oG41-rkPDx5QLplW9B2RYRCNeoA,1002
-honeybee/aperture.py,sha256=yVzhl2zqDVzIB0d1zgP2dtA8egfzzEw9bcR2ZqteMok,40763
+honeybee/aperture.py,sha256=IHWU_-y1S2CEnIJnvBWU3WzwUqM3isn2JU_-3cXYPQQ,42425
 honeybee/boundarycondition.py,sha256=ys3kgMqgeJDBMLpXwSgwNBwvKMRz-LbCtLiL9tiOXS0,13777
 honeybee/checkdup.py,sha256=8q5p4tD3S4dl69jcURQhppeajJ_pYXRBlA48zTOoAGI,8221
 honeybee/colorobj.py,sha256=jhJmTBcLayFKSniW5ASo2-XMKFsW-RBUJilc9v-33ik,13349
 honeybee/config.json,sha256=GAFduJOXTlNcPM4M0fMkSXom5Cb7XZAMYQis2WsNaq0,167
 honeybee/config.py,sha256=auH_ooOyqMKAeBZxUc2NGUehUcYg8SHya98b5hfNlvM,13836
 honeybee/dictutil.py,sha256=cOqkhgJSQ3MviIkqOPv8MRb-N-BeDv07cVcNg7w7nLY,1992
-honeybee/door.py,sha256=PZwv7us-OC_MLuSckWmwdBZgBQ9xegY9fTps_k5lG8E,26921
+honeybee/door.py,sha256=xbdefvnPPhwWzU66SpNL1C1A1YW5CNC8sLRabFZUf4E,28571
 honeybee/extensionutil.py,sha256=DDQYhM7tFD3avRSCOjwTzLqX9ldUxl5GzY79V3_sATE,9644
-honeybee/face.py,sha256=QGLC_0lrUjTpSpONLrtDWRUUFSdYEw5eG0B1DdIRif8,105662
+honeybee/face.py,sha256=j_0YPI-dZGQQZ8CJNUtmO2LC-IfpVA_Fwp7ivOoBl6Y,107622
 honeybee/facetype.py,sha256=vCtWZKHp21RH-Yzs8zsHJHuFhJvczNh0yFl8wDe_RWY,4489
 honeybee/logutil.py,sha256=2gn-6RcWqFLvwdFzBHPqUwFqTj_R3iwHKALrl-2eL7M,2564
-honeybee/model.py,sha256=LO2Px1k3eb1lJWpRAZdodr-uNr-m7ES_-yDlyZlNYTI,174113
+honeybee/model.py,sha256=RZIh4MpxYP-3g05536FUJUVmosCRDtWxtQaHwzTP954,174201
 honeybee/orientation.py,sha256=GogGblASW9OU-fobfDaQ7w5yRbEAFdJJuHwg2fadhKI,5046
 honeybee/properties.py,sha256=bJ8Zm6Q1ZSDYnlbKGWW_BOlfStm3VhCBM5T_abUeqp4,32488
-honeybee/room.py,sha256=a2_avI5GDYiYoci9PLb9ZetYcAmq6uVMQZnszyTuHWY,147839
+honeybee/room.py,sha256=Ga91VmqBTJqYyCY5bX5kHnf3zMe9reG-tHqFOTeWdSc,148639
 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.17.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_core-1.61.17.dist-info/METADATA,sha256=49_6_QwdM9FQjln0lxSMXriLwrb1_KEBLMnTgqCuntQ,3317
-honeybee_core-1.61.17.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_core-1.61.17.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
-honeybee_core-1.61.17.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
-honeybee_core-1.61.17.dist-info/RECORD,,
+honeybee_core-1.61.19.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_core-1.61.19.dist-info/METADATA,sha256=JPHx2vrZuyC5rxvxT0c2qhWlGHjo70Xex0RTTRwAxUw,3317
+honeybee_core-1.61.19.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_core-1.61.19.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
+honeybee_core-1.61.19.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
+honeybee_core-1.61.19.dist-info/RECORD,,