cleaned formatting

This commit is contained in:
Pilar Monsalvete 2023-05-18 11:36:45 -04:00
parent 8ec092a1ae
commit c04493b8a1

View File

@ -27,7 +27,7 @@ class Results:
else: else:
lighting_results = pd.DataFrame(array, columns=[f'{building.name} lighting electrical demand Wh']) lighting_results = pd.DataFrame(array, columns=[f'{building.name} lighting electrical demand Wh'])
if cte.MONTH in building.appliances_electrical_demand.keys(): if cte.MONTH in building.appliances_electrical_demand.keys():
appliances_results = building.appliances_electrical_demand[cte.MONTH]\ appliances_results = building.appliances_electrical_demand[cte.MONTH]\
.rename(columns={cte.INSEL_MEB: f'{building.name} appliances electrical demand Wh'}) .rename(columns={cte.INSEL_MEB: f'{building.name} appliances electrical demand Wh'})
else: else:
appliances_results = pd.DataFrame(array, columns=[f'{building.name} appliances electrical demand Wh']) appliances_results = pd.DataFrame(array, columns=[f'{building.name} appliances electrical demand Wh'])
@ -38,15 +38,18 @@ class Results:
dhw_results = pd.DataFrame(array, columns=[f'{building.name} domestic hot water demand Wh']) dhw_results = pd.DataFrame(array, columns=[f'{building.name} domestic hot water demand Wh'])
if cte.MONTH in building.heating_consumption.keys(): if cte.MONTH in building.heating_consumption.keys():
heating_consumption_results = pd.DataFrame(building.heating_consumption[cte.MONTH], columns=[f'{building.name} heating consumption Wh']) heating_consumption_results = pd.DataFrame(building.heating_consumption[cte.MONTH],
columns=[f'{building.name} heating consumption Wh'])
else: else:
heating_consumption_results = pd.DataFrame(array, columns=[f'{building.name} heating consumption Wh']) heating_consumption_results = pd.DataFrame(array, columns=[f'{building.name} heating consumption Wh'])
if cte.MONTH in building.cooling_consumption.keys(): if cte.MONTH in building.cooling_consumption.keys():
cooling_consumption_results = pd.DataFrame(building.cooling_consumption[cte.MONTH], columns=[f'{building.name} cooling consumption Wh']) cooling_consumption_results = pd.DataFrame(building.cooling_consumption[cte.MONTH],
columns=[f'{building.name} cooling consumption Wh'])
else: else:
cooling_consumption_results = pd.DataFrame(array, columns=[f'{building.name} cooling consumption Wh']) cooling_consumption_results = pd.DataFrame(array, columns=[f'{building.name} cooling consumption Wh'])
if cte.MONTH in building.domestic_hot_water_consumption.keys(): if cte.MONTH in building.domestic_hot_water_consumption.keys():
dhw_consumption_results = pd.DataFrame(building.domestic_hot_water_consumption[cte.MONTH], columns=[f'{building.name} domestic hot water consumption Wh']) dhw_consumption_results = pd.DataFrame(building.domestic_hot_water_consumption[cte.MONTH],
columns=[f'{building.name} domestic hot water consumption Wh'])
else: else:
dhw_consumption_results = pd.DataFrame(array, columns=[f'{building.name} domestic hot water consumption Wh']) dhw_consumption_results = pd.DataFrame(array, columns=[f'{building.name} domestic hot water consumption Wh'])