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

fixed error in logic in _associate_energy_systems

Browse Source
This commit is contained in:
Pilar Monsalvete 2023-10-06 04:11:56 -04:00
parent cbda6ce13d
commit f13d7fd860
2 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hub/imports/energy_systems/montreal_custom_energy_system_parameters.py
View File

@ -75,9 +75,10 @@ class MontrealCustomEnergySystemParameters:
@staticmethod @staticmethod
def _create_generic_systems(archetype, building, def _create_generic_systems(archetype, building,
_energy_systems_connection_table, _generic_energy_systems): _energy_systems_connection_table, _generic_energy_systems):
building_systems = []
data = [archetype.name, building.name] data = [archetype.name, building.name]
_energy_systems_connection_table.loc[len(_energy_systems_connection_table)] = data _energy_systems_connection_table.loc[len(_energy_systems_connection_table)] = data
if archetype.name not in _generic_energy_systems:
building_systems = []
for system in archetype.systems: for system in archetype.systems:
energy_system = GenericEnergySystem() energy_system = GenericEnergySystem()
_hub_demand_types = [] _hub_demand_types = []
@ -116,7 +117,6 @@ class MontrealCustomEnergySystemParameters:
energy_system.distribution_system = _distribution_system energy_system.distribution_system = _distribution_system
building_systems.append(energy_system) building_systems.append(energy_system)
if archetype.name not in _generic_energy_systems:
_generic_energy_systems[archetype.name] = building_systems _generic_energy_systems[archetype.name] = building_systems
return _energy_systems_connection_table, _generic_energy_systems return _energy_systems_connection_table, _generic_energy_systems

2
tests/test_systems_catalog.py
View File

@ -41,5 +41,3 @@ 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
print(catalog.entries()) print(catalog.entries())