honeybee-core 1.61.28__tar.gz → 1.61.30__tar.gz

{honeybee_core-1.61.28/honeybee_core.egg-info → honeybee_core-1.61.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.28
+Version: 1.61.30
 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.28 → honeybee_core-1.61.30}/honeybee/cli/edit.py

@@ -104,7 +104,8 @@ def solve_adjacency(model_file, no_merge, no_intersect, no_overwrite,
         air_boundary = not wall
         adiabatic = not surface
         parsed_model.solve_adjacency(
-            merge_coplanar, intersect, overwrite, air_boundary, adiabatic)
+            merge_coplanar, intersect, overwrite,
+            air_boundary=air_boundary, adiabatic=adiabatic)
 
         # write the new model out to the file or stdout
         output_file.write(json.dumps(parsed_model.to_dict()))

{honeybee_core-1.61.28 → honeybee_core-1.61.30}/honeybee/face.py

@@ -740,6 +740,8 @@ class Face(_BaseWithShade):
                     if len(joined_bounds) == 1:  # can be represented with a single Face3D
                         verts3d = tuple(ref_plane.xy_to_xyz(_v) for _v in joined_bounds[0])
                         non_rect_geos = [Face3D(verts3d, plane=ref_plane)]
+                    elif len(joined_bounds) == 0:  # everything was invalid
+                        non_rect_geos = []
                     else:  # need to separate holes from distinct Face3Ds
                         bound_faces = []
                         for poly in joined_bounds:

{honeybee_core-1.61.28 → honeybee_core-1.61.30}/honeybee/model.py

@@ -1449,7 +1449,7 @@ class Model(_Base):
 
     def solve_adjacency(
             self, merge_coplanar=False, intersect=False, overwrite=False,
-            air_boundary=False, adiabatic=False,
+            remove_mismatched_sub_faces=True, air_boundary=False, adiabatic=False,
             tolerance=None, angle_tolerance=None):
         """Solve adjacency between Rooms of the Model.
 
@@ -1465,6 +1465,10 @@ class Model(_Base):
                 solved. (Default: False).
             overwrite: Boolean to note whether existing Surface boundary
                 conditions should be overwritten. (Default: False).
+            remove_mismatched_sub_faces: Boolean to note whether any mis-matches
+                in sub-faces between adjacent rooms should simply result in
+                the sub-faces being removed rather than raising an
+                exception. (Default: True).
             air_boundary: Boolean to note whether the wall adjacencies should be
                 of the air boundary face type. (Default: False).
             adiabatic: Boolean to note whether the adjacencies should be
@@ -1491,11 +1495,20 @@ class Model(_Base):
 
         # solve adjacency
         if not overwrite:  # only assign new adjacencies
-            adj_info = Room.solve_adjacency(self.rooms, tol)
+            adj_info = Room.solve_adjacency(self.rooms, tol, remove_mismatched_sub_faces)
         else:  # overwrite existing Surface BC
             adj_faces = Room.find_adjacency(self.rooms, tol)
-            for face_pair in adj_faces:
-                face_pair[0].set_adjacency(face_pair[1])
+            if remove_mismatched_sub_faces:
+                for face_pair in adj_faces:
+                    try:
+                        face_pair[0].set_adjacency(face_pair[1])
+                    except AssertionError:
+                        face_pair[0].remove_sub_faces()
+                        face_pair[1].remove_sub_faces()
+                        face_pair[0].set_adjacency(face_pair[1])
+            else:
+                for face_pair in adj_faces:
+                    face_pair[0].set_adjacency(face_pair[1])
             adj_info = {'adjacent_faces': adj_faces}
 
         # try to assign the air boundary face type

{honeybee_core-1.61.28 → honeybee_core-1.61.30}/honeybee/room.py

@@ -1759,10 +1759,18 @@ class Room(_BaseWithShade):
                         nf = Face(fid, new_geo, prop_f.type, fbc)
                         for ap in apertures:
                             if nf.geometry.is_sub_face(ap.geometry, tol, a_tol):
-                                nf.add_aperture(ap)
+                                try:
+                                    nf.add_aperture(ap)
+                                except AssertionError:  # probably adiabatic
+                                    nf.boundary_condition = boundary_conditions.outdoors
+                                    nf.add_aperture(ap)
                         for dr in doors:
                             if nf.geometry.is_sub_face(dr.geometry, tol, a_tol):
-                                nf.add_door(dr)
+                                try:
+                                    nf.add_door(dr)
+                                except AssertionError:  # probably adiabatic
+                                    nf.boundary_condition = boundary_conditions.outdoors
+                                    nf.add_door(dr)
                         if i == 0:  # add all assigned shades to this face
                             nf.add_indoor_shades(in_shades)
                             nf.add_outdoor_shades(out_shades)
@@ -1943,7 +1951,7 @@ class Room(_BaseWithShade):
             room.coplanar_split(other_rooms, tolerance, angle_tolerance)
 
     @staticmethod
-    def solve_adjacency(rooms, tolerance=0.01):
+    def solve_adjacency(rooms, tolerance=0.01, remove_mismatched_sub_faces=False):
         """Solve for adjacencies between a list of rooms.
 
         Note that this method will mutate the input rooms by setting Surface
@@ -1956,6 +1964,10 @@ class Room(_BaseWithShade):
             tolerance: The minimum difference between the coordinate values of two
                 faces at which they can be considered centered adjacent. Default: 0.01,
                 suitable for objects in meters.
+            remove_mismatched_sub_faces: Boolean to note whether any mis-matches
+                in sub-faces between adjacent rooms should simply result in
+                the sub-faces being removed rather than raising an
+                exception. (Default: False).
 
         Returns:
             A dictionary of information about the objects that had their adjacency set.
@@ -1989,7 +2001,15 @@ class Room(_BaseWithShade):
                             if not isinstance(face_2.boundary_condition, Surface):
                                 if face_1.geometry.is_centered_adjacent(
                                         face_2.geometry, tolerance):
-                                    face_info = face_1.set_adjacency(face_2)
+                                    if not remove_mismatched_sub_faces:
+                                        face_info = face_1.set_adjacency(face_2)
+                                    else:
+                                        try:
+                                            face_info = face_1.set_adjacency(face_2)
+                                        except AssertionError:
+                                            face_1[0].remove_sub_faces()
+                                            face_2.remove_sub_faces()
+                                            face_info = face_1.set_adjacency(face_2)
                                     adj_info['adjacent_faces'].append((face_1, face_2))
                                     adj_info['adjacent_apertures'].extend(
                                         face_info['adjacent_apertures'])

{honeybee_core-1.61.28 → honeybee_core-1.61.30}/honeybee/typing.py

@@ -3,6 +3,7 @@ import re
 import os
 import math
 import uuid
+import hashlib
 
 try:
     INFPOS = math.inf
@@ -170,7 +171,8 @@ def clean_string(value, input_name=''):
     """Clean a string so that it is valid for both Radiance and EnergyPlus.
 
     This will strip out spaces and special characters and raise an error if the
-    string is empty after stripping or has more than 100 characters.
+    string is has more than 100 characters. If the input has no valid characters
+    after stripping out illegal ones, a randomly-generated UUID will be returned.
     """
     try:
         value = value.replace(' ', '_')  # spaces > underscores for readability
@@ -178,8 +180,10 @@ def clean_string(value, input_name=''):
     except TypeError:
         raise TypeError('Input {} must be a text string. Got {}: {}.'.format(
             input_name, type(value), value))
-    assert len(val) > 0, 'Input {} "{}" contains no valid characters.'.format(
-        input_name, value)
+    if len(val) == 0:  # generate a unique but consistent ID from the input
+        sha256_hash = hashlib.sha256(value.encode('utf-8'))
+        hash_str = str(sha256_hash.hexdigest())
+        return hash_str[:8] if len(hash_str) > 8 else hash_str
     assert len(val) <= 100, 'Input {} "{}" must be less than 100 characters.'.format(
         input_name, value)
     return val
@@ -188,8 +192,9 @@ def clean_string(value, input_name=''):
 def clean_rad_string(value, input_name=''):
     """Clean a string for Radiance that can be used for rad material names.
 
-    This includes stripping out illegal characters and white spaces as well as
-    raising an error if no legal characters are found.
+    This includes stripping out illegal characters and white spaces. If the input
+    has no valid characters after stripping out illegal ones, a randomly-generated
+    UUID will be returned.
     """
     try:
         value = value.replace(' ', '_')  # spaces > underscores for readability
@@ -197,8 +202,10 @@ def clean_rad_string(value, input_name=''):
     except TypeError:
         raise TypeError('Input {} must be a text string. Got {}: {}.'.format(
             input_name, type(value), value))
-    assert len(val) > 0, 'Input {} "{}" contains no valid characters.'.format(
-        input_name, value)
+    if len(val) == 0:  # generate a unique but consistent ID from the input
+        sha256_hash = hashlib.sha256(value.encode('utf-8'))
+        hash_str = str(sha256_hash.hexdigest())
+        return hash_str[:8] if len(hash_str) > 8 else hash_str
     return val
 
 
@@ -206,8 +213,9 @@ def clean_ep_string(value, input_name=''):
     """Clean a string for EnergyPlus that can be used for energy material names.
 
     This includes stripping out all illegal characters, removing trailing spaces,
-    and rasing an error if the name is not longer than 100 characters or no legal
-    characters found.
+    and rasing an error if the name is not longer than 100 characters. If the input
+    has no valid characters after stripping out illegal ones, a randomly-generated
+    UUID will be returned.
     """
     try:
         val = ''.join(i for i in value if ord(i) < 128)  # strip out non-ascii
@@ -216,8 +224,10 @@ def clean_ep_string(value, input_name=''):
         raise TypeError('Input {} must be a text string. Got {}: {}.'.format(
             input_name, type(value), value))
     val = val.strip()
-    assert len(val) > 0, 'Input {} "{}" contains no valid characters.'.format(
-        input_name, value)
+    if len(val) == 0:  # generate a unique but consistent ID from the input
+        sha256_hash = hashlib.sha256(value.encode('utf-8'))
+        hash_str = str(sha256_hash.hexdigest())
+        return hash_str[:8] if len(hash_str) > 8 else hash_str
     assert len(val) <= 100, 'Input {} "{}" must be less than 100 characters.'.format(
         input_name, value)
     return val
@@ -449,6 +459,10 @@ def clean_doe2_string(value, max_length=24):
         raise TypeError('Input must be a text string. Got {}: {}.'.format(
             type(value), value))
     val = val.strip()
+    if len(val) == 0:  # generate a unique but consistent ID from the input
+        sha256_hash = hashlib.sha256(value.encode('utf-8'))
+        hash_str = str(sha256_hash.hexdigest())
+        return hash_str[:8] if len(hash_str) > 8 else hash_str
     return readable_short_name(val, max_length)
 
 

{honeybee_core-1.61.28 → honeybee_core-1.61.30/honeybee_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.28
+Version: 1.61.30
 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