CERC/hub
58
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 84 Wiki Activity

Merge pull request 'retrofit_project' (#25) from retrofit_project into main

Browse Source 
Reviewed-on: https://nextgenerations-cities.encs.concordia.ca/gitea/CERC/hub/pulls/25
This commit is contained in:
Guille Gutierrez 2023-06-07 14:50:00 -04:00
commit ea00266626
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hub/city_model_structure/building.py
View File

@ -608,16 +608,16 @@ class Building(CityObject):
for i, value in enumerate(schedule.values):
if value > 0:
_working_hours_per_schedule[i] = 1
for day_type in schedule.day_types:
_working_hours_per_thermal_zone[day_type] = _working_hours_per_schedule
for day_type in schedule.day_types:
_working_hours_per_thermal_zone[day_type] = _working_hours_per_schedule
if len(_working_hours) == 0:
_working_hours = _working_hours_per_thermal_zone
else:
for key, item in _working_hours.items():
saved_values = _working_hours_per_thermal_zone[key]
for i, value in enumerate(item):
if saved_values[i] == 1:
value = 1
_working_hours[key][i] = max(_working_hours[key][i], saved_values[i])
_total_hours = 0
for key in _working_hours:
hours = sum(_working_hours[key])

2
hub/exports/exports_factory.py
View File

@ -17,7 +17,7 @@ class ExportsFactory:
"""
Exports factory class
"""
def __init__(self, handler, city, path,target_buildings=None,adjacent_buildings=None):
def __init__(self, handler, city, path, target_buildings=None, adjacent_buildings=None):
self._city = city
self._handler = '_' + handler.lower()
validate_import_export_type(ExportsFactory, handler)