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

Modified city merge function in city

Browse Source
This commit is contained in:
Peter Yefi 2023-02-22 20:17:04 -05:00
parent c3f4c27811
commit a06eced6f4
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hub/city_model_structure/city.py
View File

@ -29,6 +29,7 @@ from hub.helpers.geometry_helper import GeometryHelper
from hub.helpers.location import Location
from hub.city_model_structure.energy_system import EnergySystem
from hub.city_model_structure.lca_material import LcaMaterial
import pandas as pd
class City:
@ -447,8 +448,25 @@ class City:
def merge(self, city) -> City:
_merge_city = self.copy
selected_city_object = None
# set initial minimum radiation to a higher number
min_radiation = 1000000
for city_object in city.city_objects:
_merge_city.add_city_object(city_object)
if city_object.type == 'building':
building_radiation = 0
for surface in city_object.surfaces:
radiation = surface.global_irradiance
if "yearly" in radiation:
building_radiation += radiation["yearly"].iloc[0]
elif "monthly" in radiation and "yearly" not in radiation:
radiation["yearly"] = pd.DataFrame({radiation["monthly"].sum()})
building_radiation += radiation["yearly"].iloc[0]
if building_radiation < min_radiation:
min_radiation = building_radiation
selected_city_object = city_object
# merge the city object with the minimum radiation
if selected_city_object is not None:
_merge_city.add_city_object(selected_city_object)
return _merge_city
@property

2
hub/imports/db_factory.py
View File

@ -51,4 +51,4 @@ class DBFactory:
:param city_id: city id or None
:param city_object_id: city object id or None
"""
self._simulation_results.insert(name, values,city_id, city_object_id)
self._simulation_results.insert(name, values, city_id, city_object_id)