From 44dff9b47ef5718d89f67fb6e20d2a33493e5974 Mon Sep 17 00:00:00 2001 From: jgavalda Date: Mon, 17 Jul 2023 09:47:15 -0400 Subject: [PATCH] Final version summercourse --- results.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/results.py b/results.py index dff7a52..1161222 100644 --- a/results.py +++ b/results.py @@ -152,7 +152,7 @@ class Results: metadata_file.write(file) def outputsforgraph(self): - file = 'city name: ' + self._city.name + '\n' + outputs_energy =pd.DataFrame() array = [None] * 12 for building in self._city.buildings: if cte.MONTH in building.heating_demand.keys(): @@ -268,10 +268,13 @@ class Results: dhw_consumption_results.values.sum(), extra_electrical_consumption.values.sum() ] + outputs_energy[f'building {building.name}'] = listgraph + outputs_energy.index = ['Lighting consumption', 'Appliances consumption', 'Heating consumption', + 'Cooling consumption', 'DHW consumption', 'Extra electrical consumption'] total_final_energy = (lighting_results.values.sum() + appliances_results.values.sum() + \ heating_consumption_results.values.sum() + cooling_consumption_results.values.sum() + \ dhw_consumption_results.values.sum() + extra_electrical_consumption.values.sum())/1000 - return listgraph, total_final_energy + return outputs_energy, total_final_energy