From 286e5c190ceff7fcdc0c7ae9d3e8cd2423890fb7 Mon Sep 17 00:00:00 2001
From: p_monsalvete <pilar.monsalvete@concordia.ca>
Date: Thu, 28 Sep 2023 10:35:11 -0400
Subject: [PATCH] modifying sanam catalog model

---
 .../stochastic_occupancy_model/archetype.py   | 19 +++----------------
 .../stochastic_occupancy_model/cluster.py     | 14 ++++++++++++++
 .../stochastic_schedule                       |  0
 .../stochastic_schedule.py                    | 19 -------------------
 4 files changed, 17 insertions(+), 35 deletions(-)
 create mode 100644 hub/catalog_factories/data_models/stochastic_occupancy_model/cluster.py
 delete mode 100644 hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule
 delete mode 100644 hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule.py

diff --git a/hub/catalog_factories/data_models/stochastic_occupancy_model/archetype.py b/hub/catalog_factories/data_models/stochastic_occupancy_model/archetype.py
index 71d597d1..740e676e 100644
--- a/hub/catalog_factories/data_models/stochastic_occupancy_model/archetype.py
+++ b/hub/catalog_factories/data_models/stochastic_occupancy_model/archetype.py
@@ -6,7 +6,6 @@ Project Coder Sanam Dabirian sanam.dabirian@mail.concordia.ca
 """
 
 
-
 class Archetype:
   """
   Archetype class
@@ -14,14 +13,13 @@ class Archetype:
   def __init__(self, archetype_id,
                name,
                function,
-               climate_zone, stochastic_schedule
+               climate_zone
                ):
     self._id = archetype_id
     self._name = name
     self._function = function
     self._climate_zone = climate_zone
-    self._stochastic_schedule
-
+    self._clusters = clusters
 
   @property
   def id(self):
@@ -55,24 +53,13 @@ class Archetype:
     """
     return self._climate_zone
 
-  @property
-  def stchastic_schedule(self):
-    """
-    Get stochastic schedules from the code
-    :return: schedule
-    """
-    return self._stochastic_schedule
-
   def to_dictionary(self):
     """Class content to dictionary"""
     _stochastic_schedule = []
-    for _stochastic_schedule in self.stochastic_schedule:
-      _stochastic_schedule.append(_stochastic_schedule.to_dictionary())
     content = {'Archetype': {'id': self.id,
                              'name': self.name,
                              'function': self.function,
-                             'climate zone': self.climate_zone,
-                             'stochastic_schedule': self.stochastic_schedule
+                             'climate zone': self.climate_zone
                              }
                }
     return content
diff --git a/hub/catalog_factories/data_models/stochastic_occupancy_model/cluster.py b/hub/catalog_factories/data_models/stochastic_occupancy_model/cluster.py
new file mode 100644
index 00000000..8f03501f
--- /dev/null
+++ b/hub/catalog_factories/data_models/stochastic_occupancy_model/cluster.py
@@ -0,0 +1,14 @@
+from hub.catalog_factories.data_models.usages.schedule import Schedule
+
+
+class Cluster:
+  """
+  Archetype class
+  """
+  def __init__(self):
+    self._day_type = day_type
+    self._schedules = schedules
+
+  @property
+  def schedules(self) -> [Schedule]:
+    return self._schedules
diff --git a/hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule b/hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule
deleted file mode 100644
index e69de29b..00000000
diff --git a/hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule.py b/hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule.py
deleted file mode 100644
index 6df529a0..00000000
--- a/hub/catalog_factories/data_models/stochastic_occupancy_model/stochastic_schedule.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Stochastic_occupancy catalog stochastic schedules
-SPDX - License - Identifier: LGPL - 3.0 - or -later
-Copyright © 2022 Concordia CERC group
-Project Coder Sanam Dabirian sanam.dabirian@mail.concordia.ca
-"""
-
-class StochasticSchedules:
-  """
-  Schedule class
-  """
-
-  def __init__(self, schedule_type, values, data_type, time_step, time_range, day_types):
-    self._type = schedule_type
-    self._values = values
-    self._data_type = data_type
-    self._time_step = time_step
-    self._time_range = time_range
-    self._day_types = day_types
\ No newline at end of file