honeybee-core 1.61.29__tar.gz → 1.61.31__tar.gz

{honeybee_core-1.61.29/honeybee_core.egg-info → honeybee_core-1.61.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.29
+Version: 1.61.31
 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
@@ -14,8 +14,8 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ladybug-core==0.44.19
-Requires-Dist: ladybug-geometry-polyskel==1.7.30
+Requires-Dist: ladybug-core==0.44.20
+Requires-Dist: ladybug-geometry-polyskel==1.7.31
 Requires-Dist: honeybee-schema==1.59.0; python_version >= "3.7"
 
 ![Honeybee](https://www.ladybug.tools/assets/img/honeybee.png)

{honeybee_core-1.61.29 → honeybee_core-1.61.31}/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.29 → honeybee_core-1.61.31}/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.29 → honeybee_core-1.61.31}/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
@@ -3484,11 +3497,6 @@ class Model(_Base):
             json_output: Boolean to note whether the output validation report
                 should be formatted as a JSON object instead of plain text.
         """
-        # first get the function to call on this class
-        check_func = getattr(Model, check_function, None)
-        assert check_func is not None, \
-            'Honeybee Model class has no method {}'.format(check_function)
-
         # process the input model if it's not already serialized
         report = ''
         if isinstance(model, str):
@@ -3505,8 +3513,22 @@ class Model(_Base):
         elif not isinstance(model, Model):
             report = 'Input Model for validation is not a Model object, ' \
                 'file path to a Model or a Model HBJSON string.'
+
+        # get the function to call to do checks
+        if '.' in check_function:  # nested attribute
+            attributes = check_function.split('.')  # get all the sub-attributes
+            check_func = model
+            for attribute in attributes:
+                if check_func is None:
+                    continue
+                check_func = getattr(check_func, attribute, None)
+        else:
+            check_func = getattr(model, check_function, None)
+        assert check_func is not None, \
+            'Honeybee Model class has no method {}'.format(check_function)
+
         # process the arguments and options
-        args = [model] if check_args is None else [model] + list(check_args)
+        args = [] if check_args is None else [] + list(check_args)
         kwargs = {'raise_exception': False}
 
         # create the report
@@ -3517,9 +3539,8 @@ class Model(_Base):
             ver_msg = 'Validating Model using honeybee-core=={} and ' \
                 'honeybee-schema=={}'.format(c_ver, s_ver)
             # run the check function
-            if isinstance(args[0], Model):
-                kwargs['detailed'] = False
-                report = check_func(*args, **kwargs)
+            kwargs['detailed'] = False
+            report = check_func(*args, **kwargs)
             # format the results of the check
             if report == '':
                 full_msg = ver_msg + '\nCongratulations! Your Model is valid!'

{honeybee_core-1.61.29 → honeybee_core-1.61.31}/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.29 → honeybee_core-1.61.31/honeybee_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-core
-Version: 1.61.29
+Version: 1.61.31
 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
@@ -14,8 +14,8 @@ Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ladybug-core==0.44.19
-Requires-Dist: ladybug-geometry-polyskel==1.7.30
+Requires-Dist: ladybug-core==0.44.20
+Requires-Dist: ladybug-geometry-polyskel==1.7.31
 Requires-Dist: honeybee-schema==1.59.0; python_version >= "3.7"
 
 ![Honeybee](https://www.ladybug.tools/assets/img/honeybee.png)

honeybee_core-1.61.31/honeybee_core.egg-info/requires.txt

@@ -0,0 +1,5 @@
+ladybug-core==0.44.20
+ladybug-geometry-polyskel==1.7.31
+
+[:python_version >= "3.7"]
+honeybee-schema==1.59.0

honeybee_core-1.61.31/requirements.txt

@@ -0,0 +1,3 @@
+ladybug-core==0.44.20
+ladybug-geometry-polyskel==1.7.31
+honeybee-schema==1.59.0;python_version>='3.7'

honeybee_core-1.61.29/honeybee_core.egg-info/requires.txt

@@ -1,5 +0,0 @@
-ladybug-core==0.44.19
-ladybug-geometry-polyskel==1.7.30
-
-[:python_version >= "3.7"]
-honeybee-schema==1.59.0

honeybee_core-1.61.29/requirements.txt

@@ -1,3 +0,0 @@
-ladybug-core==0.44.19
-ladybug-geometry-polyskel==1.7.30
-honeybee-schema==1.59.0;python_version>='3.7'