Code organization

city_model_structure/attributes/usage_zone.py

@@ -7,6 +7,7 @@ Contributors Guille Gutierrez guillermo.gutierrezmorote@concordia.ca
 from typing import List
 from city_model_structure.attributes.internal_gains import InternalGains
 from helpers.configuration_helper import ConfigurationHelper
+from city_model_structure.attributes.lighting import Lighting
 
 
 class UsageZone:
@@ -26,10 +27,16 @@ class UsageZone:
     self._dhw_preparation_temperature = None
     self._electrical_app_average_consumption_sqm_year = None
     # 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._occupancy = None
     self._schedules = None
     self._heating_schedule = None
+    self._lights = None
+
+  @property
+  def lights(self) -> List[Lighting]:
+    return self._lights
 
   @property
   def internal_gains(self) -> List[InternalGains]:
@@ -186,16 +193,16 @@ class UsageZone:
   @property
   def schedules(self):
     """
-    Get schedule of Sundays
-    :return: [Sundays Schedule_Values]
+    Get schedules
+    :return: [Schedule_Values]
     """
     return self._schedules
 
   @schedules.setter
   def schedules(self, value):
     """
-    occupancy schedules of Sundays
-    :param value: Sunday schedules
+    occupancy schedules
+    :param value: schedules
     """
     self._schedules = value
 

tests/test_occupancy_factory.py

@@ -9,7 +9,8 @@ from unittest import TestCase
 from factories.geometry_factory import GeometryFactory
 from factories.usage_factory import UsageFactory
 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):