Skip to content

Commit

Permalink
Undo mark as not implemented
Browse files Browse the repository at this point in the history
  • Loading branch information
birgits committed Oct 12, 2022
1 parent 75084b6 commit 15623df
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions edisgo/edisgo.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
integrate_charging_parks,
)
from edisgo.io.generators_import import oedb as import_generators_oedb

# from edisgo.io.heat_pump_import import oedb as import_heat_pumps_oedb
from edisgo.io.heat_pump_import import oedb as import_heat_pumps_oedb
from edisgo.network import timeseries
from edisgo.network.electromobility import Electromobility
from edisgo.network.heat import HeatPump
Expand Down Expand Up @@ -1660,14 +1659,13 @@ def import_heat_pumps(self, scenario=None, **kwargs):
See :func:`edisgo.io.heat_pump_import.oedb`.
"""
raise NotImplementedError
# integrated_heat_pumps = import_heat_pumps_oedb(
# edisgo_object=self, scenario=scenario, **kwargs
# )
# self.heat_pump.set_heat_demand(
# self, "oedb", heat_pump_names=integrated_heat_pumps
# )
# self.heat_pump.set_cop(self, "oedb", heat_pump_names=integrated_heat_pumps)
integrated_heat_pumps = import_heat_pumps_oedb(
edisgo_object=self, scenario=scenario, **kwargs
)
self.heat_pump.set_heat_demand(
self, "oedb", heat_pump_names=integrated_heat_pumps
)
self.heat_pump.set_cop(self, "oedb", heat_pump_names=integrated_heat_pumps)

def apply_heat_pump_operating_strategy(
self, strategy="uncontrolled", heat_pump_names=None, **kwargs
Expand Down

0 comments on commit 15623df

Please sign in to comment.