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

Code organization

Browse Source
This commit is contained in:
Guille 2020-12-15 11:05:02 -05:00
parent 229f942734
commit e0990448bb
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
city_model_structure/attributes/usage_zone.py
View File

@ -7,6 +7,7 @@ Contributors Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
from typing import List from typing import List
from city_model_structure.attributes.internal_gains import InternalGains from city_model_structure.attributes.internal_gains import InternalGains
from helpers.configuration_helper import ConfigurationHelper from helpers.configuration_helper import ConfigurationHelper
from city_model_structure.attributes.lighting import Lighting
class UsageZone: class UsageZone:
@ -26,10 +27,16 @@ class UsageZone:
self._dhw_preparation_temperature = None self._dhw_preparation_temperature = None
self._electrical_app_average_consumption_sqm_year = None self._electrical_app_average_consumption_sqm_year = None
# todo: mechanical_air_change must come from library, talk to Rabeeh # todo: mechanical_air_change must come from library, talk to Rabeeh
# todo: check to code clean and un used attributes
self._mechanical_air_change = ConfigurationHelper().min_air_change self._mechanical_air_change = ConfigurationHelper().min_air_change
self._occupancy = None self._occupancy = None
self._schedules = None self._schedules = None
self._heating_schedule = None self._heating_schedule = None
self._lights = None
@property
def lights(self) -> List[Lighting]:
return self._lights
@property @property
def internal_gains(self) -> List[InternalGains]: def internal_gains(self) -> List[InternalGains]:
@ -186,16 +193,16 @@ class UsageZone:
@property @property
def schedules(self): def schedules(self):
""" """
Get schedule of Sundays Get schedules
:return: [Sundays Schedule_Values] :return: [Schedule_Values]
""" """
return self._schedules return self._schedules
@schedules.setter @schedules.setter
def schedules(self, value): def schedules(self, value):
""" """
occupancy schedules of Sundays occupancy schedules
:param value: Sunday schedules :param value: schedules
""" """
self._schedules = value self._schedules = value

3
tests/test_occupancy_factory.py
View File

@ -9,7 +9,8 @@ from unittest import TestCase
from factories.geometry_factory import GeometryFactory from factories.geometry_factory import GeometryFactory
from factories.usage_factory import UsageFactory from factories.usage_factory import UsageFactory
from factories.occupancy_factory import OccupancyFactory from factories.occupancy_factory import OccupancyFactory
from city_model_structure.attributes.occupancy import Occupancy from city_model_structure.attributes.lighting import Lighting
from city_model_structure.attributes.domestic_hot_water import DomesticHotWater
class TestOccupancyFactory(TestCase): class TestOccupancyFactory(TestCase):