honeybee-energy 1.116.27__py2.py3-none-any.whl → 1.116.28__py2.py3-none-any.whl

honeybee_energy/properties/model.py

@@ -820,15 +820,7 @@ class ModelEnergyProperties(object):
         detailed = False if raise_exception else detailed
         msgs = []
         # perform checks for duplicate identifiers
-        msgs.append(self.check_duplicate_material_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_construction_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_construction_set_identifiers(False, detailed))
-        msgs.append(
-            self.check_duplicate_schedule_type_limit_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_schedule_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_program_type_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_hvac_identifiers(False, detailed))
-        msgs.append(self.check_duplicate_shw_identifiers(False, detailed))
+        msgs.append(self.check_all_duplicate_identifiers(False, detailed))
         # perform checks for specific energy simulation rules
         msgs.append(self.check_all_zones_have_one_hvac(False, detailed))
         msgs.append(self.check_detailed_hvac_rooms(False, detailed))
@@ -845,6 +837,44 @@ class ModelEnergyProperties(object):
             raise ValueError(full_msg)
         return full_msg
 
+    def check_all_duplicate_identifiers(self, raise_exception=True, detailed=False):
+        """Check that there are no duplicate identifiers for any geometry objects.
+
+        This includes Rooms, Faces, Apertures, Doors, Shades, and ShadeMeshes.
+
+        Args:
+            raise_exception: Boolean to note whether a ValueError should be raised
+                if any Model errors are found. If False, this method will simply
+                return a text string with all errors that were found. (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 text string with all errors that were found or a list if detailed is True.
+            This string (or list) will be empty if no errors were found.
+        """
+        # set up defaults to ensure the method runs correctly
+        detailed = False if raise_exception else detailed
+        msgs = []
+        # perform checks for duplicate identifiers
+        msgs.append(self.check_duplicate_material_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_construction_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_construction_set_identifiers(False, detailed))
+        stl_msgs = self.check_duplicate_schedule_type_limit_identifiers(False, detailed)
+        msgs.append(stl_msgs)
+        msgs.append(self.check_duplicate_schedule_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_program_type_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_hvac_identifiers(False, detailed))
+        msgs.append(self.check_duplicate_shw_identifiers(False, detailed))
+        # output a final report of errors or raise an exception
+        full_msgs = [msg for msg in msgs if msg]
+        if detailed:
+            return [m for msg in full_msgs for m in msg]
+        full_msg = '\n'.join(full_msgs)
+        if raise_exception and len(full_msgs) != 0:
+            raise ValueError(full_msg)
+        return full_msg
+
     def check_duplicate_material_identifiers(self, raise_exception=True, detailed=False):
         """Check that there are no duplicate Material identifiers in the model.
 
@@ -1002,7 +1032,7 @@ class ModelEnergyProperties(object):
             A string with the message or a list with a dictionary if detailed is True.
         """
         detailed = False if raise_exception else detailed
-        # gather a list of all the missing rooms
+        # gather a list of all the zones with multiple HVACs
         invalid_zones = {}
         for zone, rooms in self.host.zone_dict.items():
             if len(rooms) == 1:
@@ -1012,7 +1042,7 @@ class ModelEnergyProperties(object):
             if len(hvacs) > 1:
                 invalid_zones[zone] = [rooms, hvacs]
 
-        # if missing rooms were found, then report the issue
+        # if multiple HVACs in the same zone were found, then report the issue
         if len(invalid_zones) != 0:
             if detailed:
                 all_err = []
@@ -1226,6 +1256,7 @@ class ModelEnergyProperties(object):
         Returns:
             A string with the message or a list with a dictionary if detailed is True.
         """
+        detailed = False if raise_exception else detailed
         # first see if there's more than one vegetation material
         all_constrs = self.room_constructions + self.face_constructions
         materials = []
@@ -1296,6 +1327,7 @@ class ModelEnergyProperties(object):
         Returns:
             A string with the message or a list with a dictionary if detailed is True.
         """
+        detailed = False if raise_exception else detailed
         # get the maximum elevation of all the rooms
         conv_fac = conversion_factor_to_meters(self.host.units)
         max_elev_model = max_elevation / conv_fac

{honeybee_energy-1.116.27.dist-info → honeybee_energy-1.116.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-energy
-Version: 1.116.27
+Version: 1.116.28
 Summary: Energy simulation library for honeybee.
 Home-page: https://github.com/ladybug-tools/honeybee-energy
 Author: Ladybug Tools

{honeybee_energy-1.116.27.dist-info → honeybee_energy-1.116.28.dist-info}/RECORD

@@ -115,7 +115,7 @@ honeybee_energy/properties/aperture.py,sha256=lR2zMmGg-c0uhAiIq26Rk3iAV0_v-c6kiI
 honeybee_energy/properties/door.py,sha256=IYNOkzLWJG5c4_EsHc1avWzZ-08a2RfjV0WzfivIvwc,15622
 honeybee_energy/properties/extension.py,sha256=ILzHYtu5Y_KCOUixipWY9NTJHFgvZI7v27sDcFLuSmg,8539
 honeybee_energy/properties/face.py,sha256=-7lj9_fzoGQ0QhGo_f7U6gUuB3Xy87fpgwSYnVWwZ8s,11400
-honeybee_energy/properties/model.py,sha256=BqGjshRK3oUOgWC-5vKj-roknF71lLdpHRX1ByMPxas,127420
+honeybee_energy/properties/model.py,sha256=6_Uqt7qUROZS3Zxq4xEp96CggfzR_1k1T-ViYa_H6AQ,129066
 honeybee_energy/properties/room.py,sha256=QAVRTWQKuSRHH7-nGx74q3UuaLfb01ZIbvixFTup9Ew,82311
 honeybee_energy/properties/shade.py,sha256=Aj1RZh2KSkVMn5VT_QUckF_5R3I0O3b35EabqaI2i5g,14107
 honeybee_energy/properties/shademesh.py,sha256=ykbs4llT86C_U5BhQy2EbINewfg9eVxiPaq5yCRhud8,11486
@@ -156,9 +156,9 @@ honeybee_energy/ventcool/opening.py,sha256=ZywoADlNQ6_8OfjV71ZUpbCAetQrRVj7aprBj
 honeybee_energy/ventcool/simulation.py,sha256=gMF4sgCQ5R4iFWPnvvB3wxgeP_zEwnWl71ObIIe4XGU,14423
 tests/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/fixtures/userdata_fixtures.py,sha256=yDvBR6nsltel_U8hUoUsJ6yufPKTR7Wnsgxe68HtswQ,313
-honeybee_energy-1.116.27.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-honeybee_energy-1.116.27.dist-info/METADATA,sha256=-3G-Rz-JN-OD01bZsoWshz2k6OMOz2OXudiZVDJOQ5Q,3575
-honeybee_energy-1.116.27.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-honeybee_energy-1.116.27.dist-info/entry_points.txt,sha256=QOMJbH-StaxT4hCjskZtqetNCMNioP3ZiuhoLQ6MANc,63
-honeybee_energy-1.116.27.dist-info/top_level.txt,sha256=V9Lz0281hfT83Fy0fSdn_6vwRK9vTQe1_LQXd0_-gAI,22
-honeybee_energy-1.116.27.dist-info/RECORD,,
+honeybee_energy-1.116.28.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+honeybee_energy-1.116.28.dist-info/METADATA,sha256=gbP68B-xcgwiZZPSkTfR4syLkvIgyGwyxe4Im9-YZfI,3575
+honeybee_energy-1.116.28.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+honeybee_energy-1.116.28.dist-info/entry_points.txt,sha256=QOMJbH-StaxT4hCjskZtqetNCMNioP3ZiuhoLQ6MANc,63
+honeybee_energy-1.116.28.dist-info/top_level.txt,sha256=V9Lz0281hfT83Fy0fSdn_6vwRK9vTQe1_LQXd0_-gAI,22
+honeybee_energy-1.116.28.dist-info/RECORD,,