honeybee-core 1.64.0__tar.gz → 1.64.1__tar.gz

{honeybee_core-1.64.0/honeybee_core.egg-info → honeybee_core-1.64.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-core
-Version: 1.64.0
+Version: 1.64.1
 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.64.0 → honeybee_core-1.64.1}/honeybee/model.py

@@ -1559,6 +1559,25 @@ class Model(_Base):
         for shade_mesh in self._shade_meshes:
             shade_mesh.add_prefix(prefix)
 
+    def reset_room_ids(self):
+        """Reset the identifiers of the Model Rooms to be derived from display_names.
+
+        In the event that duplicate Room identifiers are found, an integer will
+        be automatically appended to the new Room ID to make it unique.
+
+        Returns:
+            A dictionary that relates the old identifiers (keys) to the new
+            identifiers (values). This can be used to map between old and new
+            objects and update things like Surface boundary conditions.
+        """
+        room_dict, room_map = {}, {}
+        for room in self.rooms:
+            new_id = clean_and_number_string(
+                room.display_name, room_dict, 'Room identifier')
+            room_map[room.identifier] = new_id
+            room.identifier = new_id
+        return room_map
+
     def reset_ids(self, repair_surface_bcs=True):
         """Reset the identifiers of all Model objects to be derived from display_names.
 
@@ -1613,39 +1632,7 @@ class Model(_Base):
                 shade_mesh.display_name, sm_dict, 'ShadeMesh identifier')
         # reset all of the Surface boundary conditions if requested
         if repair_surface_bcs:
-            for room in self.rooms:
-                for face in room.faces:
-                    if isinstance(face.boundary_condition, Surface):
-                        old_objs = face.boundary_condition.boundary_condition_objects
-                        try:
-                            new_objs = (face_map[old_objs[0]], room_map[old_objs[1]])
-                        except KeyError:  # missing adjacency
-                            try:  # see if maybe the room reference is still there
-                                new_objs = (old_objs[0], room_map[old_objs[1]])
-                            except KeyError:  # just let the invalid adjacency pass
-                                continue
-                        new_bc = Surface(new_objs)
-                        face.boundary_condition = new_bc
-                        for ap in face.apertures:
-                            old_objs = ap.boundary_condition.boundary_condition_objects
-                            try:
-                                new_objs = (ap_map[old_objs[0]], face_map[old_objs[1]],
-                                            room_map[old_objs[2]])
-                            except KeyError:  # missing adjacency
-                                new_objs = (old_objs[0], old_objs[1],
-                                            room_map[old_objs[2]])
-                            new_bc = Surface(new_objs, True)
-                            ap.boundary_condition = new_bc
-                        for dr in face.doors:
-                            old_objs = dr.boundary_condition.boundary_condition_objects
-                            try:
-                                new_objs = (dr_map[old_objs[0]], face_map[old_objs[1]],
-                                            room_map[old_objs[2]])
-                            except KeyError:  # missing adjacency
-                                new_objs = (old_objs[0], old_objs[1],
-                                            room_map[old_objs[2]])
-                            new_bc = Surface(new_objs, True)
-                            dr.boundary_condition = new_bc
+            self._repair_surface_bcs(room_map, face_map, ap_map, dr_map)
         # return a dictionary that maps between old and new IDs
         return {
             'rooms': room_map,
@@ -1654,24 +1641,90 @@ class Model(_Base):
             'doors': dr_map
         }
 
-    def reset_room_ids(self):
-        """Reset the identifiers of the Model Rooms to be derived from display_names.
+    def reset_ids_to_integers(self, start_integer=0, repair_surface_bcs=True):
+        """Reset the identifiers of all Model geometry objects to be a unique integer.
 
-        In the event that duplicate Room identifiers are found, an integer will
-        be automatically appended to the new Room ID to make it unique.
+        Integers are simply incremented from the start_integer, assigning integers
+        first to Rooms, then to Faces, then to Apertures/Doors and lastly to
+        Shades/ShadeMeshes.
+
+        Args:
+            start_integer: The starting integer that will be used to set a lower
+                limit on the 
+            repair_surface_bcs: A Boolean to note whether all Surface boundary
+                conditions across the model should be updated with the new
+                identifiers that were generated from the display names. (Default: True).
 
         Returns:
-            A dictionary that relates the old identifiers (keys) to the new
-            identifiers (values). This can be used to map between old and new
-            objects and update things like Surface boundary conditions.
+            An integer for the last value assigned to the model geometry objects.
+            This can be used to ensure that any future IDs assigned after running
+            this method do not have IDs that collide with the model objects.
         """
-        room_dict, room_map = {}, {}
+        # set up dictionaries to hold various pieces of information
+        room_map, face_map, ap_map, dr_map = {}, {}, {}, {}
+        # loop through the objects and change their identifiers
         for room in self.rooms:
-            new_id = clean_and_number_string(
-                room.display_name, room_dict, 'Room identifier')
-            room_map[room.identifier] = new_id
-            room.identifier = new_id
-        return room_map
+            room_map[room.identifier] = str(start_integer)
+            room.identifier = str(start_integer)
+            start_integer += 1
+        for face in self.faces:
+            face_map[face.identifier] = str(start_integer)
+            face.identifier = str(start_integer)
+            start_integer += 1
+        for ap in self.apertures:
+            ap_map[ap.identifier] = str(start_integer)
+            ap.identifier = str(start_integer)
+            start_integer += 1
+        for dr in self.doors:
+            dr_map[dr.identifier] = str(start_integer)
+            dr.identifier = str(start_integer)
+            start_integer += 1
+        for shade in self.shades:
+            shade.identifier = str(start_integer)
+            start_integer += 1
+        for shade_mesh in self.shade_meshes:
+            shade_mesh.identifier = str(start_integer)
+            start_integer += 1
+        # reset all of the Surface boundary conditions if requested
+        if repair_surface_bcs:
+            self._repair_surface_bcs(room_map, face_map, ap_map, dr_map)
+        return start_integer
+
+    def _repair_surface_bcs(self, room_map, face_map, ap_map, dr_map):
+        """Repair Surface boundary conditions across the model using dict maps."""
+        for room in self.rooms:
+            for face in room.faces:
+                if isinstance(face.boundary_condition, Surface):
+                    old_objs = face.boundary_condition.boundary_condition_objects
+                    try:
+                        new_objs = (face_map[old_objs[0]], room_map[old_objs[1]])
+                    except KeyError:  # missing adjacency
+                        try:  # see if maybe the room reference is still there
+                            new_objs = (old_objs[0], room_map[old_objs[1]])
+                        except KeyError:  # just let the invalid adjacency pass
+                            continue
+                    new_bc = Surface(new_objs)
+                    face.boundary_condition = new_bc
+                    for ap in face.apertures:
+                        old_objs = ap.boundary_condition.boundary_condition_objects
+                        try:
+                            new_objs = (ap_map[old_objs[0]], face_map[old_objs[1]],
+                                        room_map[old_objs[2]])
+                        except KeyError:  # missing adjacency
+                            new_objs = (old_objs[0], old_objs[1],
+                                        room_map[old_objs[2]])
+                        new_bc = Surface(new_objs, True)
+                        ap.boundary_condition = new_bc
+                    for dr in face.doors:
+                        old_objs = dr.boundary_condition.boundary_condition_objects
+                        try:
+                            new_objs = (dr_map[old_objs[0]], face_map[old_objs[1]],
+                                        room_map[old_objs[2]])
+                        except KeyError:  # missing adjacency
+                            new_objs = (old_objs[0], old_objs[1],
+                                        room_map[old_objs[2]])
+                        new_bc = Surface(new_objs, True)
+                        dr.boundary_condition = new_bc
 
     def solve_adjacency(
             self, merge_coplanar=False, intersect=False, overwrite=False,
@@ -2181,6 +2234,18 @@ class Model(_Base):
             extrusion_rooms.append(room.to_extrusion(tol, a_tol))
         self._rooms = extrusion_rooms
 
+    def shade_meshes_to_shades(self):
+        """Convert all ShadeMesh objects on the Model to planar Shades."""
+        new_shades = []
+        for shade_mesh in self.shade_meshes:
+            try:
+                shade_mesh.triangulate_and_remove_degenerate_faces(self.tolerance)
+                new_shades.extend(shade_mesh.to_shades())
+            except AssertionError:
+                pass  # completely degenerate ShadeMesh to ignore
+        self._orphaned_shades.extend(new_shades)
+        self._shade_meshes = []
+
     def convert_to_units(self, units='Meters'):
         """Convert all of the geometry in this model to certain units.
 

{honeybee_core-1.64.0 → honeybee_core-1.64.1}/honeybee/shademesh.py

@@ -324,6 +324,23 @@ class ShadeMesh(_Base):
             base['user_data'] = self.user_data
         return base
 
+    def to_shades(self):
+        """Return a list of Honeybee Shade objects derived from this ShadeMesh.
+
+        Note that the resulting Shades may be degenerate or non-planar so it
+        may be useful to call triangulate_and_remove_degenerate_faces on this
+        object before converting to Shades.
+        """
+        from honeybee.shade import Shade  # imported here to avoid circular import
+        shades = []
+        for i, shade_geo in enumerate(self.geometry.face_vertices):
+            shade_id = '{}_{}'.format(self.identifier, i)
+            shade = Shade(shade_id, Face3D(shade_geo), self.is_detached)
+            if self._display_name is not None:
+                shade.display_name = '{} {}'.format(self.display_name, i)
+            shades.append(shade)
+        return shades
+
     @staticmethod
     def _display_mesh(mesh3d, color):
         """Create a DisplayMesh3D dictionary from a Mesh3D and color."""

{honeybee_core-1.64.0 → honeybee_core-1.64.1/honeybee_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-core
-Version: 1.64.0
+Version: 1.64.1
 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.64.0 → honeybee_core-1.64.1}/tests/model_test.py

@@ -399,6 +399,18 @@ def test_reset_ids():
     assert new_model.check_missing_adjacencies() == ''
 
 
+def test_reset_ids_to_integers():
+    """Test the reset_ids_to_integers method."""
+    model_json = './tests/json/model_with_adiabatic.hbjson'
+    parsed_model = Model.from_hbjson(model_json, cleanup_irrational=True)
+
+    new_model = parsed_model.duplicate()
+    new_model.reset_ids_to_integers(True)
+
+    assert new_model.rooms[0].identifier != parsed_model.rooms[0].identifier
+    assert new_model.check_missing_adjacencies() == ''
+
+
 def test_offset_aperture_edges():
     """Test the Face offset_aperture_edges method."""
     model_json = './tests/json/room_for_window_offset.hbjson'
@@ -588,6 +600,12 @@ def test_remove_degenerate_geometry():
     model.remove_degenerate_geometry()
     assert len(model.shade_meshes) == 1
 
+    model = Model('MultiZoneSingleFamilyHouse',
+                  [first_floor, second_floor], shade_meshes=[shade1, shade2])
+    model.shade_meshes_to_shades()
+    assert len(model.shade_meshes) == 0
+    assert len(model.orphaned_shades) == 2
+
 
 def test_assign_stories_by_floor_height():
     """Test the Model assign_stories_by_floor_height method."""