CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

added Schedule class. Modified schedules attribute in usage_zone.py according to this new class. Modified comnet import and its test. Other imports and exports related to schedules will be broken.

Browse Source
This commit is contained in:
Pilar 2021-09-01 17:36:02 -04:00
parent 7bb775f92a
commit 83b0716f0f
1 changed files with 6 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
city_model_structure/building_demand/usage_zone.py
View File

@ -10,6 +10,7 @@ from typing import List, TypeVar
InternalGains = TypeVar('InternalGains') InternalGains = TypeVar('InternalGains')
Occupants = TypeVar('Occupants') Occupants = TypeVar('Occupants')
Polyhedron = TypeVar('Polyhedron') Polyhedron = TypeVar('Polyhedron')
Schedule = TypeVar('Schedule')
class UsageZone: class UsageZone:
@ -23,7 +24,6 @@ class UsageZone:
self._heating_setpoint = None self._heating_setpoint = None
self._heating_setback = None self._heating_setback = None
self._cooling_setpoint = None self._cooling_setpoint = None
self._occupancy_density = None
self._hours_day = None self._hours_day = None
self._days_year = None self._days_year = None
self._dhw_average_volume_pers_day = None self._dhw_average_volume_pers_day = None
@ -31,9 +31,6 @@ class UsageZone:
self._electrical_app_average_consumption_sqm_year = None self._electrical_app_average_consumption_sqm_year = None
self._mechanical_air_change = None self._mechanical_air_change = None
self._occupants = None self._occupants = None
self._heating_schedule = None
self._cooling_schedule = None
self._ventilation_schedule = None
self._schedules = None self._schedules = None
self._volume = None self._volume = None
self._volume_geometry = None self._volume_geometry = None
@ -195,85 +192,21 @@ class UsageZone:
self._occupants = values self._occupants = values
@property @property
def heating_schedule(self) -> dict: def schedules(self) -> List[Schedule]:
""" """
Get heating schedules: list of 0, 1 that define whether the heating system should be OFF or ON Get usage zone schedules
:return: dict{DataFrame(int)} :return: List[Schedule]
"""
return self._heating_schedule
@heating_schedule.setter
def heating_schedule(self, values):
"""
Set heating schedules
:param values: dict{DataFrame(int)}
"""
self._heating_schedule = values
@property
def cooling_schedule(self) -> dict:
"""
Get cooling schedules: list of 0, 1 that define whether the cooling system should be OFF or ON
:return: dict{DataFrame(int)}
"""
return self._cooling_schedule
@cooling_schedule.setter
def cooling_schedule(self, values):
"""
Set cooling schedules
:param values: dict{DataFrame(int)}
"""
self._cooling_schedule = values
@property
def ventilation_schedule(self) -> dict:
"""
Get ventilation schedules: list of 0, 1 that define whether the ventilation system should be OFF or ON
:return: dict{DataFrame(int)}
"""
return self._ventilation_schedule
@ventilation_schedule.setter
def ventilation_schedule(self, values):
"""
Set ventilation_schedule schedules
:param values: dict{DataFrame(int)}
"""
self._ventilation_schedule = values
@property
def schedules(self) -> dict:
"""
Get schedules of diverse issues in a dictionary
:return: dict()
""" """
return self._schedules return self._schedules
@schedules.setter @schedules.setter
def schedules(self, values): def schedules(self, values):
""" """
Set schedules of diverse issues in a dictionary Set usage zone schedules
:param values: dict() :param values: List[Schedule]
""" """
self._schedules = values self._schedules = values
@property
def occupancy_density(self):
"""
Get schedules density in persons per square meter
:return: float
"""
return self._occupancy_density
@occupancy_density.setter
def occupancy_density(self, values):
"""
Set schedules density in persons per square meter
:param values: float
"""
self._occupancy_density = values
@property @property
def dhw_average_volume_pers_day(self): def dhw_average_volume_pers_day(self):
""" """