From 9e2900ff832f09560d5ad5cb8e86782298321e80 Mon Sep 17 00:00:00 2001
From: SanamDabirian <sanamdabirian@gmail.com>
Date: Wed, 21 Oct 2020 01:12:36 -0400
Subject: [PATCH] Adding occupancy schedule attributes to building class

---
 city_model_structure/building.py              | 55 ++++++++++++++++++-
 .../{schedule_values.py => schedule_value.py} |  2 +-
 2 files changed, 54 insertions(+), 3 deletions(-)
 rename city_model_structure/{schedule_values.py => schedule_value.py} (91%)

diff --git a/city_model_structure/building.py b/city_model_structure/building.py
index b5292b75..46c503eb 100644
--- a/city_model_structure/building.py
+++ b/city_model_structure/building.py
@@ -18,14 +18,14 @@ from city_model_structure.thermal_zone import ThermalZone
 from city_model_structure.usage_zone import UsageZone
 from city_model_structure.city_object import CityObject
 from city_model_structure.building_unit import BuildingUnit
-
+from city_model_structure.schedule_value import ScheduleValue
 
 class Building(CityObject):
   """
   Building(CityObject) class
   """
   def __init__(self, name, lod, surfaces, terrains, year_of_construction, function, lower_corner, attic_heated=0,
-               basement_heated=0, week_day_schedules, saturday_schedules, sunday_schedules):
+               basement_heated=0, week_day_schedule, saturday_schedule, sunday_schedule):
     super().__init__(lod, surfaces, name)
     self._basement_heated = basement_heated
     self._attic_heated = attic_heated
@@ -43,6 +43,9 @@ class Building(CityObject):
     self._monthly_cooling = pd.DataFrame()
     self._hourly_heating = pd.DataFrame()
     self._hourly_cooling = pd.DataFrame()
+    self._week_day_schedule = []
+    self._saturday_schedule = []
+    self._sunday_schedule = []
 
     # ToDo: Check this for LOD4
     self._thermal_zones = []
@@ -337,3 +340,51 @@ class Building(CityObject):
     :param value: DataFrame(cooling demand)
     """
     self._hourly_cooling.append(value)
+
+  @property
+  def week_day_schedules(self) -> List[ScheduleValue]:
+    """
+    Get schedule of weekdays
+    :return: [ScheduleValue]
+    """
+    return self._week_day_schedule
+
+  @week_day_schedule.setter
+  def week_day_schedule(self, value):
+    """
+    occupancy schedules of week days
+    :param value: week day schedules
+    """
+    self._week_day_schedule.append(value)
+
+  @property
+  def saturday_schedule(self) -> List[ScheduleValue]:
+    """
+    Get schedule of Saturdays
+    :return: [Saturday Schedule_Values]
+    """
+    return self._saturday_schedule
+
+  @saturday_schedule.setter
+  def saturday_schedule(self, value):
+    """
+    occupancy schedules of Saturdays
+    :param value: Saturday schedules
+    """
+    self._saturday_schedule.append(value)
+
+  @property
+  def sunday_schedule(self) -> List[ScheduleValue]:
+    """
+    Get schedule of Sundays
+    :return: [Sundays Schedule_Values]
+    """
+    return self._sunday_schedule
+
+  @sunday_schedule.setter
+  def sunday_schedule(self, value):
+    """
+    occupancy schedules of Sundays
+    :param value: Sunday schedules
+    """
+    self._sunday_schedule.append(value)
\ No newline at end of file
diff --git a/city_model_structure/schedule_values.py b/city_model_structure/schedule_value.py
similarity index 91%
rename from city_model_structure/schedule_values.py
rename to city_model_structure/schedule_value.py
index cc019421..3629e57d 100644
--- a/city_model_structure/schedule_values.py
+++ b/city_model_structure/schedule_value.py
@@ -5,7 +5,7 @@ Copyright © 2020 Project Author Sanam Dabirian sanam.dabirian@mail.concordia.ca
 """
 
 
-class schedule_value:
+class ScheduleValue:
   """
   Schedule Values class
   """