add_data_for_quebec_and_israel #30

Merged
g_gutierrez merged 10 commits from add_data_for_quebec_and_israel into main 2023-07-12 16:29:56 -04:00
Showing only changes of commit bca68f33ff - Show all commits

View File

@ -56,7 +56,6 @@ class MontrealCustomEnergySystemParameters:
_energy_systems_connection_table, _generic_energy_systems \ _energy_systems_connection_table, _generic_energy_systems \
= self._create_generic_systems(archetype, building, = self._create_generic_systems(archetype, building,
_energy_systems_connection_table, _generic_energy_systems) _energy_systems_connection_table, _generic_energy_systems)
city.energy_systems_connection_table = _energy_systems_connection_table city.energy_systems_connection_table = _energy_systems_connection_table
city.generic_energy_systems = _generic_energy_systems city.generic_energy_systems = _generic_energy_systems
@ -123,9 +122,8 @@ class MontrealCustomEnergySystemParameters:
energy_systems_connection = city.energy_systems_connection_table energy_systems_connection = city.energy_systems_connection_table
for building in city.buildings: for building in city.buildings:
_building_energy_systems = [] _building_energy_systems = []
energy_systems = energy_systems_connection['Energy System Type'].where( energy_systems = energy_systems_connection['Energy System Type'][
energy_systems_connection['Building'] == building.name energy_systems_connection['Building'] == building.name]
)
for energy_system in energy_systems: for energy_system in energy_systems:
if str(energy_system) == 'nan': if str(energy_system) == 'nan':
break break