diff --git a/hub/imports/energy_systems/water_to_water_hp_parameters.py b/hub/imports/energy_systems/water_to_water_hp_parameters.py index 2fe85523..66f6d29a 100644 --- a/hub/imports/energy_systems/water_to_water_hp_parameters.py +++ b/hub/imports/energy_systems/water_to_water_hp_parameters.py @@ -4,16 +4,17 @@ SPDX - License - Identifier: LGPL - 3.0 - or -later Copyright © 2022 Concordia CERC group Project Coder Peter Yefi peteryefi@gmail.com """ -import io -import pandas as pd from typing import Dict -from hub.city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP -from hub.city_model_structure.energy_system import EnergySystem -from scipy.optimize import curve_fit -import numpy as np from typing import List +import numpy as np +import pandas as pd +from scipy.optimize import curve_fit + +from hub.city_model_structure.energy_system import EnergySystem +from hub.city_model_structure.energy_systems.water_to_water_hp import WaterToWaterHP + class WaterToWaterHPParameters: """ @@ -25,25 +26,7 @@ class WaterToWaterHPParameters: self._base_path = (base_path / 'heat_pumps/water_to_water.xlsx') def _read_file(self) -> Dict: - """ - reads xlsx file containing water to water heat pump information - into a dictionary - :return : Dict - - with open(self._base_path, 'rb') as xls: - xl_file = pd.read_excel(io.BytesIO(xls.read())) - - hp_data = {} - flow_rates = { - '156': [2.84, 4.23, 5.68], - '256': [4.73, 7.13, 9.446], - '335': [6.62, 9.97, 12.93], - } - - for sheet, dataframe in xl_file.items(): - print(sheet, xl_file[sheet]) - df = dataframe[xl_file[sheet].columns[1]] - """ + # todo: this method is keeping the excel file open and should be either corrected or removed xl_file = pd.ExcelFile(self._base_path) heat_pump_dfs = {sheet_name: xl_file.parse(sheet_name) for sheet_name in xl_file.sheet_names} @@ -58,7 +41,6 @@ class WaterToWaterHPParameters: for sheet, dataframe in heat_pump_dfs.items(): df = heat_pump_dfs[sheet].dropna(axis=1, how='all') - print(df) df = df.iloc[3:, 6:35] if '156' in sheet: