m_osman/city_retrofit
1
0
Fork 0
forked from s_ranjbar/city_retrofit
Code Pull Requests Activity

north_america_energy_system_catalog.py is completed and all the bugs have been resolved.

Browse Source
This commit is contained in:
Saeed Ranjbar 2023-08-24 15:09:17 -04:00
parent 3deb63b14a
commit fe0a2d3003
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hub/catalog_factories/data_models/energy_systems/pv_generation_system.py
View File

@ -110,7 +110,9 @@ class PvGenerationSystem(GenerationSystem):
def to_dictionary(self): def to_dictionary(self):
"""Class content to dictionary""" """Class content to dictionary"""
content = {'Photovoltaic Module': { content = {'Energy Generation component': {
'id': self.id,
'name': self.name,
'model name': self.model_name, 'model name': self.model_name,
'manufacturer': self.manufacturer, 'manufacturer': self.manufacturer,
'type': self.system_type, 'type': self.system_type,

24
hub/catalog_factories/energy_systems/north_america_energy_system_catalog.py
View File

@ -33,13 +33,13 @@ class NorthAmericaEnergySystemCatalog(Catalog):
self._storage_components = self._load_storage_components() self._storage_components = self._load_storage_components()
self._systems = self._load_systems() self._systems = self._load_systems()
self._system_archetypes = self._load_archetypes() self._system_archetypes = self._load_archetypes()
print(self._system_archetypes)
self._content = Content(self._system_archetypes, self._content = Content(self._system_archetypes,
self._systems, self._systems,
self._generation_components, self._generation_components,
None, None,
None, None,
self._storage_components) self._storage_components)
print(self._content)
def _load_generation_components(self): def _load_generation_components(self):
generation_components = [] generation_components = []
@ -381,11 +381,11 @@ class NorthAmericaEnergySystemCatalog(Catalog):
for system_cluster in system_clusters: for system_cluster in system_clusters:
name = system_cluster['name'] name = system_cluster['name']
systems = system_cluster['systems']['system_id'] systems = system_cluster['systems']['system_id']
integer_system_ids = [int(item) for item in systems]
_systems = [] _systems = []
for system in systems: for system_archetype in self._systems:
for system_archetype in self._systems: if int(system_archetype.id) in integer_system_ids:
if int(system_archetype.id) == int(system): _systems.append(system_archetype)
_systems.append(system_archetype)
_system_archetypes.append(Archetype(None, name, _systems)) _system_archetypes.append(Archetype(None, name, _systems))
return _system_archetypes return _system_archetypes
@ -422,9 +422,17 @@ class NorthAmericaEnergySystemCatalog(Catalog):
@staticmethod @staticmethod
def _search_generation_equipment(generation_systems, generation_id): def _search_generation_equipment(generation_systems, generation_id):
_generation_systems = [] _generation_systems = []
for generation in generation_systems: if type(generation_id) == list:
if generation.id in generation_id: integer_ids = [int(item) for item in generation_id]
_generation_systems.append(generation) for generation in generation_systems:
if int(generation.id) in integer_ids:
_generation_systems.append(generation)
else:
integer_id = int(generation_id)
for generation in generation_systems:
if int(generation.id) == integer_id:
_generation_systems.append(generation)
if len(_generation_systems) == 0: if len(_generation_systems) == 0:
_generation_systems = None _generation_systems = None
raise ValueError(f'The system with the following id is not found in catalog [{generation_id}]') raise ValueError(f'The system with the following id is not found in catalog [{generation_id}]')

4
tests/test_systems_catalog.py
View File

@ -38,5 +38,5 @@ class TestSystemsCatalog(TestCase):
def test_north_america_systems_catalog(self): def test_north_america_systems_catalog(self):
catalog = EnergySystemsCatalogFactory('north_america').catalog catalog = EnergySystemsCatalogFactory('north_america').catalog
def test_montreal_catalog(self): # def test_montreal_catalog(self):
catalog = EnergySystemsCatalogFactory('montreal_custom').catalog # catalog = EnergySystemsCatalogFactory('montreal_custom').catalog