dragonfly-doe2 0.12.3__py2.py3-none-any.whl → 0.12.5__py2.py3-none-any.whl

dragonfly_doe2/properties/model.py

@@ -1,5 +1,8 @@
 # coding=utf-8
 """Model DOE-2 Properties."""
+from ladybug_geometry.geometry3d import Face3D
+from honeybee.units import parse_distance_string
+
 from honeybee_doe2.grouping import _grouped_floor_boundary
 
 
@@ -74,6 +77,37 @@ class ModelDoe2Properties(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 DOE-2 properties.
+
+        This includes checks for everything except holes in floor plates and
+        courtyard stories.
+
+        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 doe-2 simulation rules
+        msgs.append(self.check_room_2d_floor_plate_vertex_count(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 DOE-2 properties.
 
@@ -91,8 +125,11 @@ class ModelDoe2Properties(object):
         # set up defaults to ensure the method runs correctly
         detailed = False if raise_exception else detailed
         msgs = []
-        # perform checks for specific energy simulation rules
+        tol = self.host.tolerance
+        # perform checks for specific doe-2 simulation rules
         msgs.append(self.check_room_2d_floor_plate_vertex_count(False, detailed))
+        msgs.append(self.check_no_room_2d_floor_plate_holes(False, detailed))
+        msgs.append(self.check_no_story_courtyards(tol, False, detailed))
         # output a final report of errors or raise an exception
         full_msgs = [msg for msg in msgs if msg]
         if detailed:
@@ -185,14 +222,29 @@ class ModelDoe2Properties(object):
         Returns:
             A string with the message or a list with a dictionary if detailed is True.
         """
+        # establish the tolerance and gap width at which point it is clearly a courtyard
         tolerance = self.host.tolerance if tolerance is None else tolerance
+        court_width = parse_distance_string('2ft', self.host.units)
+        # loop through the stories and identify any courtyards
         story_msgs = []
         for bldg in self.host.buildings:
             for story in bldg.unique_stories:
                 floor_geos = [room.floor_geometry for room in story.room_2ds]
                 joined_geos = _grouped_floor_boundary(floor_geos, tolerance)
-                if any(geo.has_holes for geo in joined_geos):
-                    c_count = max(len(geo.holes) for geo in joined_geos if geo.has_holes)
+                c_count = 0
+                for geo in joined_geos:
+                    if geo.has_holes:
+                        for hole in geo.holes:
+                            try:
+                                h_geo = Face3D(hole)
+                                h_geo = h_geo.remove_colinear_vertices(court_width)
+                                max_len = max(s.length for s in h_geo.boundary_segments)
+                                tol_area = max_len * court_width
+                                if h_geo.area > tol_area:
+                                    c_count += 1
+                            except (AssertionError, ValueError):
+                                pass  # gap is too small to be a true courtyard
+                if c_count != 0:
                     hole_msg = 'a courtyard' if c_count == 1 \
                         else '{} courtyards'.format(c_count)
                     msg = 'The geometry of Story "{}" contains {}, which eQuest ' \

{dragonfly_doe2-0.12.3.dist-info → dragonfly_doe2-0.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dragonfly-doe2
-Version: 0.12.3
+Version: 0.12.5
 Summary: Dragonfly extension for the DOE-2 energy simulation engine.
 Home-page: https://github.com/ladybug-tools/dragonfly-doe2
 Author: Ladybug Tools

{dragonfly_doe2-0.12.3.dist-info → dragonfly_doe2-0.12.5.dist-info}/RECORD

@@ -5,11 +5,11 @@ dragonfly_doe2/writer.py,sha256=Yfs9fEEhX8WrDqhy4nIxeOwMPDKHvu3RoeInz94pGO8,6224
 dragonfly_doe2/cli/__init__.py,sha256=OwTHSsOOEoJjbw5CqPig8Yo7jk1f6m53OFnhuZgPthE,391
 dragonfly_doe2/cli/translate.py,sha256=gVpMSL074B6YPOe26cD0njGL_durS9lugrenbLoZiUw,7989
 dragonfly_doe2/properties/__init__.py,sha256=0JiyMYGeRlPLcxh1PSr6eJzDGgfrbMivcO9dS1h7wEU,33
-dragonfly_doe2/properties/model.py,sha256=D1fQGW9h7N031GzuSCpYJ0wIR2sG8YayoHnF_n0doaw,11695
+dragonfly_doe2/properties/model.py,sha256=7vxx4KgVfXVSPVkZciVQtlmbJQEEdFt9-QzNBun-tXY,14281
 dragonfly_doe2/properties/room2d.py,sha256=ghKKhcX2TSgPUAdcQk-PPHo_5AilSmTiLElxb8--dkE,12773
-dragonfly_doe2-0.12.3.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-dragonfly_doe2-0.12.3.dist-info/METADATA,sha256=GkhjeeCBvn7Bnq5LsoaFdTkVVau4OjL-thbR67GcVbo,2690
-dragonfly_doe2-0.12.3.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
-dragonfly_doe2-0.12.3.dist-info/entry_points.txt,sha256=oBzZOsc8Bs40iHKtuyWGrz_nfLZu1-6cHrBej05ZqrY,59
-dragonfly_doe2-0.12.3.dist-info/top_level.txt,sha256=6CLCvUyl1H2vrbXmeA0ND_znFz4a2oOclc7NMBZxR6c,15
-dragonfly_doe2-0.12.3.dist-info/RECORD,,
+dragonfly_doe2-0.12.5.dist-info/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+dragonfly_doe2-0.12.5.dist-info/METADATA,sha256=4Mwwn_nfeGMul6wOidv6FYcWapSeCCSndfQlVGDSBkE,2690
+dragonfly_doe2-0.12.5.dist-info/WHEEL,sha256=AHX6tWk3qWuce7vKLrj7lnulVHEdWoltgauo8bgCXgU,109
+dragonfly_doe2-0.12.5.dist-info/entry_points.txt,sha256=oBzZOsc8Bs40iHKtuyWGrz_nfLZu1-6cHrBej05ZqrY,59
+dragonfly_doe2-0.12.5.dist-info/top_level.txt,sha256=6CLCvUyl1H2vrbXmeA0ND_znFz4a2oOclc7NMBZxR6c,15
+dragonfly_doe2-0.12.5.dist-info/RECORD,,