dragonfly-schema 1.13.1__tar.gz → 1.14.1__tar.gz

{dragonfly_schema-1.13.1 → dragonfly_schema-1.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dragonfly-schema
-Version: 1.13.1
+Version: 1.14.1
 Summary: Dragonfly Data-Model Objects
 Home-page: https://github.com/ladybug-tools/dragonfly-schema
 Author: Ladybug Tools
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-schema==1.58.6
+Requires-Dist: honeybee-schema==1.59.0
 
 [![Build Status](https://travis-ci.com/ladybug-tools/dragonfly-schema.svg?branch=master)](https://travis-ci.com/ladybug-tools/dragonfly-schema)
 [![Coverage Status](https://coveralls.io/repos/github/ladybug-tools/dragonfly-schema/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools/dragonfly-schema)

dragonfly_schema-1.14.1/dragonfly_schema/comparison/__init__.py

@@ -0,0 +1 @@
+"""Dragonfly objects specific to comparison with other models."""

dragonfly_schema-1.14.1/dragonfly_schema/comparison/properties.py

@@ -0,0 +1,56 @@
+"""Model comparison properties."""
+from pydantic import Field, constr, conlist
+from typing import List, Union
+
+from honeybee_schema._base import NoExtraBaseModel
+
+from ..window_parameter import SingleWindow, SimpleWindowArea, SimpleWindowRatio, \
+    RepeatingWindowRatio, RectangularWindows, DetailedWindows
+from ..skylight_parameter import GriddedSkylightArea, GriddedSkylightRatio, \
+    DetailedSkylights
+
+
+class Room2DComparisonProperties(NoExtraBaseModel):
+
+    type: constr(regex='^Room2DComparisonProperties$') = \
+        'Room2DComparisonProperties'
+
+    floor_boundary: List[conlist(float, min_items=2, max_items=2)] = Field(
+        None,
+        min_items=3,
+        description='A list of 2D points representing the outer boundary vertices of '
+        'the Room2D to which the host Room2D is being compared. The list should '
+        'include at least 3 points and each point should be a list of 2 (x, y) values.'
+    )
+
+    floor_holes: List[conlist(conlist(float, min_items=2, max_items=2), min_items=3)] \
+        = Field(
+        None,
+        description='Optional list of lists with one list for each hole in the floor '
+        'plate of the Room2D to which the host Room2D is being compared. Each hole '
+        'should be a list of at least 2 points and each point a list '
+        'of 2 (x, y) values. If None, it will be assumed that there are no '
+        'holes in the floor plate.'
+    )
+
+    comparison_windows: List[Union[
+        None, SingleWindow, SimpleWindowArea, SimpleWindowRatio, RepeatingWindowRatio,
+        RectangularWindows, DetailedWindows
+    ]] = Field(
+        default=None,
+        description='A list of WindowParameter objects that dictate the window '
+        'geometries of the Room2D to which the host Room2D is being compared.'
+    )
+
+    comparison_skylight: Union[
+        None, GriddedSkylightArea, GriddedSkylightRatio, DetailedSkylights
+    ] = Field(
+        default=None,
+        description='A SkylightParameter object for the Room2D to which the host '
+        'Room2D is being compared.'
+    )
+
+
+class ModelComparisonProperties(NoExtraBaseModel):
+
+    type: constr(regex='^ModelComparisonProperties$') = 'ModelComparisonProperties'

{dragonfly_schema-1.13.1 → dragonfly_schema-1.14.1}/dragonfly_schema/model.py

@@ -22,6 +22,7 @@ from .energy.properties import Room2DEnergyPropertiesAbridged, \
 from .radiance.properties import Room2DRadiancePropertiesAbridged, \
     StoryRadiancePropertiesAbridged, BuildingRadiancePropertiesAbridged, \
     ContextShadeRadiancePropertiesAbridged, ModelRadianceProperties
+from .comparison.properties import Room2DComparisonProperties, ModelComparisonProperties
 
 
 class Room2DPropertiesAbridged(BaseModel):
@@ -36,6 +37,10 @@ class Room2DPropertiesAbridged(BaseModel):
         default=None
     )
 
+    comparison: Room2DComparisonProperties = Field(
+        default=None
+    )
+
 
 class Room2D(IDdBaseModel):
 
@@ -118,6 +123,15 @@ class Room2D(IDdBaseModel):
         'Setting this to zero indicates that the room has no floor plenum.'
     )
 
+    zone: str = Field(
+        default=None,
+        description='Text string for for the zone identifier to which this Room2D '
+        ' belongs. Room2Ds sharing the same zone identifier are considered part of the '
+        'same zone in a Building. If the zone identifier has not been specified, it will '
+        'be the same as the Room2D identifier in the destination engine. Note that this '
+        'property has no character restrictions.'
+    )
+
     boundary_conditions: List[
         Union[Ground, Outdoors, Surface, Adiabatic, OtherSideTemperature]
     ] = Field(
@@ -398,6 +412,10 @@ class ModelProperties(BaseModel):
         default=None
     )
 
+    comparison: ModelComparisonProperties = Field(
+        default=None
+    )
+
 
 class Model(IDdBaseModel):
 

{dragonfly_schema-1.13.1 → dragonfly_schema-1.14.1}/dragonfly_schema.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dragonfly-schema
-Version: 1.13.1
+Version: 1.14.1
 Summary: Dragonfly Data-Model Objects
 Home-page: https://github.com/ladybug-tools/dragonfly-schema
 Author: Ladybug Tools
@@ -11,7 +11,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Operating System :: OS Independent
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: honeybee-schema==1.58.6
+Requires-Dist: honeybee-schema==1.59.0
 
 [![Build Status](https://travis-ci.com/ladybug-tools/dragonfly-schema.svg?branch=master)](https://travis-ci.com/ladybug-tools/dragonfly-schema)
 [![Coverage Status](https://coveralls.io/repos/github/ladybug-tools/dragonfly-schema/badge.svg?branch=master)](https://coveralls.io/github/ladybug-tools/dragonfly-schema)

{dragonfly_schema-1.13.1 → dragonfly_schema-1.14.1}/dragonfly_schema.egg-info/SOURCES.txt

@@ -20,6 +20,8 @@ dragonfly_schema.egg-info/SOURCES.txt
 dragonfly_schema.egg-info/dependency_links.txt
 dragonfly_schema.egg-info/requires.txt
 dragonfly_schema.egg-info/top_level.txt
+dragonfly_schema/comparison/__init__.py
+dragonfly_schema/comparison/properties.py
 dragonfly_schema/energy/__init__.py
 dragonfly_schema/energy/properties.py
 dragonfly_schema/radiance/__init__.py

dragonfly_schema-1.14.1/dragonfly_schema.egg-info/requires.txt

@@ -0,0 +1 @@
+honeybee-schema==1.59.0

dragonfly_schema-1.14.1/requirements.txt

@@ -0,0 +1 @@
+honeybee-schema==1.59.0

dragonfly_schema-1.13.1/dragonfly_schema.egg-info/requires.txt

@@ -1 +0,0 @@
-honeybee-schema==1.58.6

dragonfly_schema-1.13.1/requirements.txt

@@ -1 +0,0 @@
-honeybee-schema==1.58.6