Skip to content

Commit

Permalink
Merge af78ec6 into ff90aee
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswmackey committed Jan 19, 2020
2 parents ff90aee + af78ec6 commit fc6c20e
Show file tree
Hide file tree
Showing 15 changed files with 870 additions and 386 deletions.
2 changes: 2 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[run]
omit = scripts/*
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,8 @@ python -m pytest tests/
```python
python ./docs.py
```

5. Generate Sample Files:
```python
python ./scripts/export_samples.py
```
6 changes: 4 additions & 2 deletions dragonfly_schema/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from honeybee_schema.bc import Ground, Outdoors, Adiabatic, Surface

from ._base import NamedBaseModel
from .window_parameter import SingleWindow, SimpleWindowRatio, RepeatingWindowRatio
from .window_parameter import SingleWindow, SimpleWindowRatio, RepeatingWindowRatio, \
DetailedRectangularWindows, DetailedWindows
from .shading_parameter import ExtrudedBorder, Overhang, LouversByDistance, \
LouversByCount
from .energy.properties import Room2DEnergyPropertiesAbridged, \
Expand Down Expand Up @@ -77,7 +78,7 @@ class Room2D(NamedBaseModel):
)

window_parameters: List[Union[None, SingleWindow, SimpleWindowRatio,
RepeatingWindowRatio]] = Field(
RepeatingWindowRatio, DetailedRectangularWindows, DetailedWindows]] = Field(
default=None,
description='A list of WindowParameter objects that dictate how the window '
'geometries will be generated for each of the walls. If None, no windows '
Expand Down Expand Up @@ -108,6 +109,7 @@ def check_num_items(cls, v):
def check_num_items_holes(cls, v):
if v is not None:
for pt_list in v:
assert len(pt_list) >= 3, 'Floor holes must have at least 3 vertices.'
for pt in pt_list:
assert len(pt) == 2, 'Number of floats must be 2 for (x, y).'
return v
Expand Down

0 comments on commit fc6c20e

Please sign in to comment.