added id to thermal_boundary.py and thermal_opening.py
erased \r from files generators added generator of auxiliary files for dynamic model
This commit is contained in:
parent
aba2dd8a34
commit
44c4f666d2
|
@ -4,6 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
|
|||
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
|
||||
Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
|
||||
"""
|
||||
import uuid
|
||||
from typing import List, TypeVar, Union
|
||||
from city_model_structure.building_demand.layer import Layer
|
||||
from city_model_structure.building_demand.thermal_opening import ThermalOpening
|
||||
|
@ -19,6 +20,7 @@ class ThermalBoundary:
|
|||
"""
|
||||
def __init__(self, surface):
|
||||
self._surface = surface
|
||||
self._id = None
|
||||
self._thermal_zones = None
|
||||
# ToDo: up to at least LOD2 will be just one thermal opening per Thermal boundary only if window_ratio > 0,
|
||||
# review for LOD3 and LOD4
|
||||
|
@ -41,6 +43,16 @@ class ThermalBoundary:
|
|||
self._alpha_coefficient = None
|
||||
self._radiative_coefficient = None
|
||||
|
||||
@property
|
||||
def id(self):
|
||||
"""
|
||||
Get thermal zone id, an universally unique identifier randomly generated
|
||||
:return: str
|
||||
"""
|
||||
if self._id is None:
|
||||
self._id = uuid.uuid4()
|
||||
return self._id
|
||||
|
||||
@property
|
||||
def surface(self) -> Surface:
|
||||
"""
|
||||
|
|
|
@ -4,6 +4,7 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later
|
|||
Copyright © 2020 Project Author Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
|
||||
Contributors Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
|
||||
"""
|
||||
import uuid
|
||||
from typing import TypeVar
|
||||
|
||||
Polygon = TypeVar('Polygon')
|
||||
|
@ -14,6 +15,7 @@ class ThermalOpening:
|
|||
ThermalOpening class
|
||||
"""
|
||||
def __init__(self):
|
||||
self._id = None
|
||||
self._area = None
|
||||
self._openable_ratio = None
|
||||
self._conductivity = None
|
||||
|
@ -30,6 +32,16 @@ class ThermalOpening:
|
|||
self._alpha_coefficient = None
|
||||
self._radiative_coefficient = None
|
||||
|
||||
@property
|
||||
def id(self):
|
||||
"""
|
||||
Get thermal zone id, an universally unique identifier randomly generated
|
||||
:return: str
|
||||
"""
|
||||
if self._id is None:
|
||||
self._id = uuid.uuid4()
|
||||
return self._id
|
||||
|
||||
@property
|
||||
def area(self):
|
||||
"""
|
||||
|
|
Loading…
Reference in New Issue
Block a user