Merge remote-tracking branch 'origin/main' into Stochastic_occupancy_model

# Conflicts:
#	.gitignore

hub/catalog_factories/data_models/stochastic_occupancy_model/archetype.py

@@ -0,0 +1,76 @@
+"""
+Stochastic_occupancy catalog Archetype
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Sanam Dabirian sanam.dabirian@mail.concordia.ca
+"""
+
+
+class Archetype:
+  """
+  Archetype class
+  """
+  def __init__(self, archetype_id,
+               name,
+               building_type,
+               building_subtype,
+               climate_zone
+               ):
+    self._id = archetype_id
+    self._name = name
+    self._building_type = building_type
+    self._building_subtype = building_subtype
+    self._climate_zone = climate_zone
+    self._clusters = clusters
+
+  @property
+  def id(self):
+    """
+    Get archetype id
+    :return: str
+    """
+    return self._id
+
+  @property
+  def name(self):
+    """
+    Get archetype name
+    :return: str
+    """
+    return self._name
+
+  @property
+  def building_type(self):
+    """
+    Get archetype type
+    :return: str
+    """
+    return self._building_type
+
+  @property
+  def building_subtype(self):
+    """
+    Get archetype type
+    :return: str
+    """
+    return self._building_subtype
+
+  @property
+  def climate_zone(self):
+    """
+    Get archetype climate zone
+    :return: str
+    """
+    return self._climate_zone
+
+  def to_dictionary(self):
+    """Class content to dictionary"""
+    _stochastic_schedule = []
+    content = {'Archetype': {'id': self.id,
+                             'name': self.name,
+                             'building_type': self.building_type,
+                             'building_subtype': self.building_subtype,
+                             'climate zone': self.climate_zone
+                             }
+               }
+    return content

hub/catalog_factories/data_models/stochastic_occupancy_model/cluster.py

@@ -0,0 +1,32 @@
+"""
+Stochastic_occupancy catalog Clusters
+SPDX - License - Identifier: LGPL - 3.0 - or -later
+Copyright © 2022 Concordia CERC group
+Project Coder Sanam Dabirian sanam.dabirian@mail.concordia.ca
+"""
+
+
+from hub.catalog_factories.data_models.usages.schedule import Schedule
+
+
+class Cluster:
+  """
+  Clusters class
+  """
+  def __init__(self, day_type,
+               schedules
+               ):
+    self._day_type = day_type
+    self._schedules = schedules
+
+  @property
+  def day_type(self):
+    """
+        Get type of day (Weekday or Weekend)
+        :return: str
+    """
+    return self._day_type
+
+  @property
+  def schedules(self) -> [Schedule]:
+    return self._schedules

hub/catalog_factories/data_models/usages/lighting.py

@@ -54,7 +54,7 @@ class Lighting:
     return self._latent_fraction
 
   @property
-  def schedules(self) -> Union[None, List[Schedule]]:
+  def schedules(self) -> Union[None, List[Schedule], List[Stochastic_Schedule]]:
     """
     Get schedules
     dataType = fraction