honeybee-energy 1.116.40__tar.gz → 1.116.42__tar.gz

{honeybee_energy-1.116.40 → honeybee_energy-1.116.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-energy
-Version: 1.116.40
+Version: 1.116.42
 Summary: Energy simulation library for honeybee.
 Home-page: https://github.com/ladybug-tools/honeybee-energy
 Author: Ladybug Tools
@@ -14,7 +14,7 @@ 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: honeybee-core==1.61.22
+Requires-Dist: honeybee-core==1.61.23
 Requires-Dist: honeybee-standards==2.0.7
 Provides-Extra: standards
 Requires-Dist: honeybee-energy-standards==2.3.0; extra == "standards"

{honeybee_energy-1.116.40 → honeybee_energy-1.116.42}/honeybee_energy/properties/model.py

@@ -775,17 +775,6 @@ class ModelEnergyProperties(object):
         msgs.append(self.host.check_matching_adjacent_areas(tol, False, detailed))
         msgs.append(self.host.check_all_air_boundaries_adjacent(False, detailed))
 
-        # perform checks that are specific to EnergyPlus
-        # 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))
         # 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))
@@ -803,6 +792,44 @@ class ModelEnergyProperties(object):
             raise ValueError(full_msg)
         return full_msg
 
+    def check_generic(self, raise_exception=True, detailed=False):
+        """Check generic of the aspects of the Model energy properties.
+
+        This includes checks for everything except duplicate identifiers for
+        constructions, schedules, etc. Typically, these checks just add to the
+        validation time without providing useful information since extension
+        objects with duplicate IDs are lost during HBJSON serialization.
+
+        Args:
+            raise_exception: Boolean to note whether a ValueError should be raised
+                if any errors are found. If False, this method will simply
+                return a text string with all errors that were found.
+            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 specific energy simulation rules
+        msgs.append(self.check_all_zones_have_one_hvac(False, detailed))
+        msgs.append(self.check_detailed_hvac_rooms(False, detailed))
+        msgs.append(self.check_shw_rooms_in_model(False, detailed))
+        msgs.append(self.check_maximum_elevation(1000, False, detailed))
+        msgs.append(self.check_one_vegetation_material(False, detailed))
+        msgs.append(self.check_interior_constructions_reversed(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_all(self, raise_exception=True, detailed=False):
         """Check all of the aspects of the Model energy properties.
 
@@ -820,6 +847,8 @@ class ModelEnergyProperties(object):
         # 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_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))
@@ -837,13 +866,14 @@ class ModelEnergyProperties(object):
         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.
+        """Check that there are no duplicate identifiers for any energy objects.
 
-        This includes Rooms, Faces, Apertures, Doors, Shades, and ShadeMeshes.
+        This includes Materials, Constructions, ConstructionSets, Schedules,
+        Programs, HVACs, and SHWs.
 
         Args:
             raise_exception: Boolean to note whether a ValueError should be raised
-                if any Model errors are found. If False, this method will simply
+                if any duplicate identifiers 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).
@@ -1175,7 +1205,7 @@ class ModelEnergyProperties(object):
                         all_err.append(msg)
 
         # gather a list of all the rooms and evaluate it against the HVACs
-        room_ids = set(room.identifier for room in self.host.rooms)
+        room_ids = set(room.zone for room in self.host.rooms)
         rooms_with_hvac = set()
         problem_hvacs, problem_rooms = [], []
         for hvac in hvacs:

{honeybee_energy-1.116.40 → honeybee_energy-1.116.42}/honeybee_energy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: honeybee-energy
-Version: 1.116.40
+Version: 1.116.42
 Summary: Energy simulation library for honeybee.
 Home-page: https://github.com/ladybug-tools/honeybee-energy
 Author: Ladybug Tools
@@ -14,7 +14,7 @@ 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: honeybee-core==1.61.22
+Requires-Dist: honeybee-core==1.61.23
 Requires-Dist: honeybee-standards==2.0.7
 Provides-Extra: standards
 Requires-Dist: honeybee-energy-standards==2.3.0; extra == "standards"

{honeybee_energy-1.116.40 → honeybee_energy-1.116.42}/honeybee_energy.egg-info/requires.txt

@@ -1,4 +1,4 @@
-honeybee-core==1.61.22
+honeybee-core==1.61.23
 honeybee-standards==2.0.7
 
 [openstudio]

{honeybee_energy-1.116.40 → honeybee_energy-1.116.42}/requirements.txt

@@ -1,2 +1,2 @@
-honeybee-core==1.61.22
+honeybee-core==1.61.23
 honeybee-standards==2.0.7