honeybee-core 1.62.9__py3-none-any.whl → 1.62.11__py3-none-any.whl

honeybee/model.py

@@ -151,30 +151,12 @@ class Model(_Base):
         self.tolerance = tolerance
         self.angle_tolerance = angle_tolerance
 
-        self._rooms = []
-        self._orphaned_faces = []
-        self._orphaned_apertures = []
-        self._orphaned_doors = []
-        self._orphaned_shades = []
-        self._shade_meshes = []
-        if rooms is not None:
-            for room in rooms:
-                self.add_room(room)
-        if orphaned_faces is not None:
-            for face in orphaned_faces:
-                self.add_face(face)
-        if orphaned_apertures is not None:
-            for aperture in orphaned_apertures:
-                self.add_aperture(aperture)
-        if orphaned_doors is not None:
-            for door in orphaned_doors:
-                self.add_door(door)
-        if orphaned_shades is not None:
-            for shade in orphaned_shades:
-                self.add_shade(shade)
-        if shade_meshes is not None:
-            for shade_mesh in shade_meshes:
-                self.add_shade_mesh(shade_mesh)
+        self.rooms = rooms
+        self.orphaned_faces = orphaned_faces
+        self.orphaned_apertures = orphaned_apertures
+        self.orphaned_doors = orphaned_doors
+        self.orphaned_shades = orphaned_shades
+        self.shade_meshes = shade_meshes
 
         self._properties = ModelProperties(self)
 
@@ -717,6 +699,13 @@ class Model(_Base):
         """Get a tuple of all Room objects in the model."""
         return tuple(self._rooms)
 
+    @rooms.setter
+    def rooms(self, value):
+        self._rooms = []
+        if value is not None:
+            for room in value:
+                self.add_room(room)
+
     @property
     def faces(self):
         """Get a list of all Face objects in the model."""
@@ -822,9 +811,16 @@ class Model(_Base):
 
     @property
     def shade_meshes(self):
-        """Get a tuple of all ShadeMesh objects in the model."""
+        """Get or set a tuple of all ShadeMesh objects in the model."""
         return tuple(self._shade_meshes)
 
+    @shade_meshes.setter
+    def shade_meshes(self, value):
+        self._shade_meshes = []
+        if value is not None:
+            for shd_m in value:
+                self.add_shade_mesh(shd_m)
+
     @property
     def grouped_shades(self):
         """Get a list of lists where each sub-list contains Shades and/or ShadeMeshes
@@ -850,24 +846,53 @@ class Model(_Base):
 
     @property
     def orphaned_faces(self):
-        """Get a tuple of all Face objects without parent Rooms in the model."""
+        """Get or set a tuple of all Face objects without parent Rooms in the model."""
         return tuple(self._orphaned_faces)
 
+    @orphaned_faces.setter
+    def orphaned_faces(self, value):
+        self._orphaned_faces = []
+        if value is not None:
+            for face in value:
+                self.add_face(face)
+
     @property
     def orphaned_apertures(self):
-        """Get a tuple of all Aperture objects without parent Faces in the model."""
+        """Get or set a tuple of all Aperture objects without parent Faces in the model.
+        """
         return tuple(self._orphaned_apertures)
 
+    @orphaned_apertures.setter
+    def orphaned_apertures(self, value):
+        self._orphaned_apertures = []
+        if value is not None:
+            for ap in value:
+                self.add_aperture(ap)
+
     @property
     def orphaned_doors(self):
-        """Get a tuple of all Door objects without parent Faces in the model."""
+        """Get or set a tuple of all Door objects without parent Faces in the model."""
         return tuple(self._orphaned_doors)
 
+    @orphaned_doors.setter
+    def orphaned_doors(self, value):
+        self._orphaned_doors = []
+        if value is not None:
+            for dr in value:
+                self.add_door(dr)
+
     @property
     def orphaned_shades(self):
-        """Get a tuple of all Shade objects without parent Rooms in the model."""
+        """Get or set a tuple of all Shade objects without parent Rooms in the model."""
         return tuple(self._orphaned_shades)
 
+    @orphaned_shades.setter
+    def orphaned_shades(self, value):
+        self._orphaned_shades = []
+        if value is not None:
+            for shd in value:
+                self.add_shade(shd)
+
     @property
     def stories(self):
         """Get a list of text for each unique story identifier in the Model.

honeybee/room.py

@@ -3282,7 +3282,12 @@ class Room(_BaseWithShade):
                 local_ids, first_id = set(adj_ids), room.identifier
                 while len(adj_ids) != 0:
                     # add the current rooms to the local network
-                    adj_objs = [room_lookup[rm_id] for rm_id in adj_ids]
+                    adj_objs = []
+                    for rm_id in adj_ids:
+                        try:
+                            adj_objs.append(room_lookup[rm_id])
+                        except KeyError:  # missing adjacency among the room groups
+                            pass
                     local_network.extend(adj_objs)
                     adj_ids = []  # reset the list of new adjacencies
                     # find any rooms that are adjacent to the adjacent rooms
@@ -3294,7 +3299,12 @@ class Room(_BaseWithShade):
                             local_ids.add(rm_id)
                         adj_ids.extend(new_ids)
                 # after the local network is understood, clean up duplicated rooms
-                adj_network.append(local_network)
+                clean_local_network, exist_ids = [], set()
+                for room in local_network:
+                    if room.identifier not in exist_ids:
+                        clean_local_network.append(room)
+                        exist_ids.add(room.identifier)
+                adj_network.append(clean_local_network)
                 i_to_remove = [i for i, room_obj in enumerate(all_rooms)
                                if room_obj.identifier in local_ids]
                 for i in reversed(i_to_remove):

{honeybee_core-1.62.9.dist-info → honeybee_core-1.62.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: honeybee-core
-Version: 1.62.9
+Version: 1.62.11
 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.62.9.dist-info → honeybee_core-1.62.11.dist-info}/RECORD

@@ -16,10 +16,10 @@ honeybee/extensionutil.py,sha256=DDQYhM7tFD3avRSCOjwTzLqX9ldUxl5GzY79V3_sATE,964
 honeybee/face.py,sha256=j8ud3d-8Z8RvDomeiyYTqalu5czgiCMb08Xue_tFRGo,112287
 honeybee/facetype.py,sha256=vCtWZKHp21RH-Yzs8zsHJHuFhJvczNh0yFl8wDe_RWY,4489
 honeybee/logutil.py,sha256=2gn-6RcWqFLvwdFzBHPqUwFqTj_R3iwHKALrl-2eL7M,2564
-honeybee/model.py,sha256=YbTZJddBiLzeoivdR4QY7SqeZ_kIMVfWtuR_YwDG-j8,181203
+honeybee/model.py,sha256=WzquyG8denJ5pX-ZiAyXKp1cRXFuIFih-fT7BqiRWL4,181757
 honeybee/orientation.py,sha256=GogGblASW9OU-fobfDaQ7w5yRbEAFdJJuHwg2fadhKI,5046
 honeybee/properties.py,sha256=ok976fbUdXzLDR2XiPNf8Q5ejfOM-PArqm5CVUbFiCc,34316
-honeybee/room.py,sha256=qgn8Ur6aE864sBpPb-thHqO0kXbOmhgBCAwj5FtPAdw,162693
+honeybee/room.py,sha256=SoChV0-00oIM4RjKDPn8tTlCmtZPika0Tm2ue_lhzko,163183
 honeybee/search.py,sha256=KOIeQjYdj0yhRWPmF5kiFiH8Ei0WbzuiU-capnwYVeM,5060
 honeybee/shade.py,sha256=HwLkOqvPpluLMXzicWXmKl4fMVJHmkqqehntT69e00Q,21026
 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.62.9.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_core-1.62.9.dist-info/METADATA,sha256=wVtamXoPjP6t1ExUkw3VV9MROACE7Czsa4zuybrpISU,3729
-honeybee_core-1.62.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-honeybee_core-1.62.9.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
-honeybee_core-1.62.9.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
-honeybee_core-1.62.9.dist-info/RECORD,,
+honeybee_core-1.62.11.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_core-1.62.11.dist-info/METADATA,sha256=Ku3shh4F9BKpZRJVv7FkSN3Xensrm6_UBf_p9hqV_80,3730
+honeybee_core-1.62.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+honeybee_core-1.62.11.dist-info/entry_points.txt,sha256=r3YqOm40goBroH3ccUhpwQjvTwu10JWLd0HIRHI1J8E,47
+honeybee_core-1.62.11.dist-info/top_level.txt,sha256=8ve7puCRLUA9XDEGc1Mcs-UX9sFjpPV8MeTaIMwQ_Tg,9
+honeybee_core-1.62.11.dist-info/RECORD,,