oemof.solph 0.5.2.dev1__tar.gz → 0.5.2.dev2__tar.gz

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.2dev1
+current_version = 0.5.2.dev2
 commit = True
 tag = True
 

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/MANIFEST.in

@@ -5,7 +5,6 @@ graft tests
 
 include .bumpversion.cfg
 include .coveragerc
-include .cookiecutterrc
 include .editorconfig
 
 include AUTHORS.rst

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oemof.solph
-Version: 0.5.2.dev1
+Version: 0.5.2.dev2
 Summary: A model generator for energy system modelling and optimisation.
 Home-page: https://oemof.org
 Author: oemof developer group
@@ -9,7 +9,6 @@ License: MIT
 Project-URL: Documentation, https://oemof-solph.readthedocs.io/
 Project-URL: Changelog, https://oemof-solph.readthedocs.io/en/latest/changelog.html
 Project-URL: Issue Tracker, https://github.com/oemof/oemof-solph/issues
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Science/Research
@@ -28,11 +27,29 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
+License-File: LICENSE
+License-File: AUTHORS.rst
+Requires-Dist: blinker
+Requires-Dist: dill
+Requires-Dist: numpy
+Requires-Dist: pandas>=1.5.3
+Requires-Dist: pyomo<7.0,>=6.6.0
+Requires-Dist: networkx
+Requires-Dist: oemof.tools>=0.4.2
+Requires-Dist: oemof.network>=0.5.0a1
 Provides-Extra: dev
+Requires-Dist: matplotlib; extra == "dev"
+Requires-Dist: nbformat; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: sphinx; extra == "dev"
+Requires-Dist: sphinx_rtd_theme; extra == "dev"
+Requires-Dist: sphinx-copybutton; extra == "dev"
+Requires-Dist: sphinx-design; extra == "dev"
+Requires-Dist: termcolor; extra == "dev"
 Provides-Extra: examples
+Requires-Dist: matplotlib; extra == "examples"
 Provides-Extra: dummy
-License-File: LICENSE
-License-File: AUTHORS.rst
+Requires-Dist: oemof; extra == "dummy"
 
 
 |tox-pytest| |tox-checks| |appveyor| |coveralls| |codecov|
@@ -327,5 +344,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-

oemof.solph-0.5.2.dev2/VERSION

@@ -0,0 +1 @@
+__version__ = "0.5.2.dev2"

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/docs/conf.py

@@ -36,7 +36,7 @@ project = "oemof.solph"
 year = "2014-2023"
 author = "oemof-developer-group"
 copyright = "{0}, {1}".format(year, author)
-version = release = "0.5.2dev1"
+version = release = "0.5.2.dev2"
 
 pygments_style = "trac"
 templates_path = ["."]

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/docs/examples/index.rst

@@ -29,5 +29,4 @@ Examples
     minimal_investment.rst
     invest_nonconvex.rst
     offset_converter.rst
-    electrical.lopf.rst
     custom_constraints.rst

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/docs/whatsnew/v0-5-2.rst

@@ -5,12 +5,14 @@ API changes
 ###########
 
 * New bool attribute `use_remaining_value` of `oemof.solph.EnergySystem`
+* Use list for period definition in multi-period investment optimization.
 
 New features
 ############
 
 * Allow for evaluating differences in the remaining vs. the original value
   for multi-period investments.
+* Allow to define minimum up- and down-time per time step
 
 Documentation
 #############
@@ -22,6 +24,9 @@ Bug fixes
   Limit to costs that occur within the optimization horizon to prevent a
   bias towards investments happening earlier in the optimization horizon.
 * Fix bugs in multi-period documentation.
+* Fix y intersect of OffsetConverter
+* Fix minimum uptime being relevant for initial downtime (and vice versa).
+* Fix duplicated discounting of fixed costs for multi-period investment
 
 Testing
 #######
@@ -31,6 +36,12 @@ Other changes
 
 * Improved compatibility with upcoming oemof.network
 
+Known issues
+############
+
+* Documentation, example and API of OffsetConverter are inconsistent
+  and might not work as expected.
+
 Contributors
 ############
 

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/pyproject.toml

@@ -19,5 +19,5 @@ exclude = '''
 '''
 
 [build-system]
-requires = ["setuptools<60.0", "wheel"]
+requires = ["setuptools", "wheel"]
 build-backend = "setuptools.build_meta"

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/setup.cfg

@@ -28,7 +28,7 @@ python_files =
 	tests.py
 addopts = 
 	-ra
-	--strict
+	--strict-markers
 	--ignore=docs/conf.py
 	--ignore=setup.py
 	--ignore=ci

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/setup.py

@@ -29,7 +29,7 @@ long_description = "%s" % (
 
 setup(
     name="oemof.solph",
-    version="0.5.2dev1",
+    version="0.5.2.dev2",
     license="MIT",
     description=(
         "A model generator for energy system modelling and optimisation."

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.5.2dev1"
+__version__ = "0.5.2.dev2"
 
 from . import buses
 from . import components

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/_energy_system.py

@@ -76,14 +76,16 @@ class EnergySystem(es.EnergySystem):
         infer_last_interval=None,
         periods=None,
         use_remaining_value=False,
-        **kwargs,
+        groupings=None,
     ):
         # Doing imports at runtime is generally frowned upon, but should work
         # for now. See the TODO in :func:`constraint_grouping
         # <oemof.solph.groupings.constraint_grouping>` for more information.
         from oemof.solph import GROUPINGS
 
-        kwargs["groupings"] = GROUPINGS + kwargs.get("groupings", [])
+        if groupings is None:
+            groupings = []
+        groupings = GROUPINGS + groupings
 
         if not (
             isinstance(timeindex, pd.DatetimeIndex)
@@ -161,7 +163,9 @@ class EnergySystem(es.EnergySystem):
             raise TypeError(msg)
 
         super().__init__(
-            timeindex=timeindex, timeincrement=timeincrement, **kwargs
+            groupings=groupings,
+            timeindex=timeindex,
+            timeincrement=timeincrement,
         )
 
         self.periods = periods

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/_models.py

@@ -402,12 +402,11 @@ class Model(BaseModel):
         """Add all basic sets to the model, i.e. NODES, TIMESTEPS and FLOWS.
         Also create sets PERIODS and TIMEINDEX used for multi-period models.
         """
-        self.nodes = self.es.nodes
+        self.nodes = list(self.es.nodes)
         if self.is_cellular:
             # collect all nodes from the child cells
             for cell in self.ec:
-                for node in cell.nodes:
-                    self.nodes.append(node)
+                self.nodes.extend(cell.nodes)
         # create set with all nodes
         self.NODES = po.Set(initialize=[n for n in self.nodes])
 

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/_options.py

@@ -13,7 +13,6 @@ SPDX-FileCopyrightText: Johannes Kochems
 SPDX-License-Identifier: MIT
 
 """
-
 from oemof.solph._plumbing import sequence
 
 
@@ -184,11 +183,11 @@ class NonConvex:
         from the actual output.
     inactivity_costs : numeric (iterable or scalar)
         Costs associated with not operating the flow.
-    minimum_uptime : numeric (1 or positive integer)
+    minimum_uptime : numeric or list of numeric (1 or positive integer)
         Minimum number of time steps that a flow must be greater then its
         minimum flow after startup. Be aware that minimum up and downtimes
         can contradict each other and may lead to infeasible problems.
-    minimum_downtime : numeric (1 or positive integer)
+    minimum_downtime : numeric or list of numeric (1 or positive integer)
         Minimum number of time steps a flow is forced to zero after
         shutting down. Be aware that minimum up and downtimes can
         contradict each other and may to infeasible problems.
@@ -199,12 +198,12 @@ class NonConvex:
     initial_status : numeric (0 or 1)
         Integer value indicating the status of the flow in the first time step
         (0 = off, 1 = on). For minimum up and downtimes, the initial status
-        is set for the respective values in the edge regions e.g. if a
-        minimum uptime of four timesteps is defined, the initial status is
-        fixed for the four first and last timesteps of the optimization period.
-        If both, up and downtimes are defined, the initial status is set for
-        the maximum of both e.g. for six timesteps if a minimum downtime of
-        six timesteps is defined besides a four timestep minimum uptime.
+        is set for the respective values in the beginning e.g. if a
+        minimum uptime of four timesteps is defined and the initial status is
+        set to one, the initial status is fixed for the four first timesteps
+        of the optimization period. Otherwise if the initial status is set to
+        zero and the first timesteps are fixed for the number of minimum
+        downtime steps.
     negative_gradient_limit : numeric (iterable, scalar or None)
         the normed *upper bound* on the positive difference
         (`flow[t-1] < flow[t]`) of two consecutive flow values.
@@ -232,8 +231,8 @@ class NonConvex:
             custom_attributes = {}
 
         self.initial_status = initial_status
-        self.minimum_uptime = minimum_uptime
-        self.minimum_downtime = minimum_downtime
+        self.minimum_uptime = sequence(minimum_uptime)
+        self.minimum_downtime = sequence(minimum_downtime)
         self.maximum_startups = maximum_startups
         self.maximum_shutdowns = maximum_shutdowns
 
@@ -247,11 +246,7 @@ class NonConvex:
         for attribute, value in custom_attributes.items():
             setattr(self, attribute, value)
 
-    @property
-    def max_up_down(self):
-        """Return maximum of minimum_uptime and minimum_downtime.
-
-        The maximum of both is used to set the initial status for this
-        number of time steps within the edge regions.
-        """
-        return max(self.minimum_uptime, self.minimum_downtime)
+        if initial_status == 0:
+            self.first_flexible_timestep = self.minimum_downtime[0]
+        else:
+            self.first_flexible_timestep = self.minimum_uptime[0]

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/_plumbing.py

@@ -61,7 +61,7 @@ class _Sequence(UserList):
     --------
     >>> s = _Sequence(default=42)
     >>> len(s)
-    0
+    1
     >>> s[1]
     42
     >>> s[2]
@@ -79,7 +79,7 @@ class _Sequence(UserList):
     def __init__(self, *args, **kwargs):
         self.default = kwargs["default"]
         self.default_changed = False
-        self.highest_index = -1
+        self.highest_index = 0
         super().__init__(*args)
 
     def __getitem__(self, key):

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/buses/_bus.py

@@ -40,9 +40,26 @@ class Bus(Node):
 
     """
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.balanced = kwargs.get("balanced", True)
+    def __init__(
+        self,
+        label=None,
+        *,
+        inputs=None,
+        outputs=None,
+        balanced=True,
+        custom_properties=None,
+    ):
+        if inputs is None:
+            inputs = {}
+        if outputs is None:
+            outputs = {}
+        super().__init__(
+            label,
+            inputs=inputs,
+            outputs=outputs,
+            custom_properties=custom_properties,
+        )
+        self.balanced = balanced
 
     def constraint_group(self):
         if self.balanced:

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/buses/experimental/_electrical_bus.py

@@ -47,8 +47,23 @@ class ElectricalBus(Bus):
 
     """
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.slack = kwargs.get("slack", False)
-        self.v_max = kwargs.get("v_max", 1000)
-        self.v_min = kwargs.get("v_min", -1000)
+    def __init__(
+        self,
+        label=None,
+        *,
+        v_max,
+        v_min,
+        inputs=None,
+        outputs=None,
+        custom_properties=None,
+        slack=False,
+    ):
+        super().__init__(
+            label,
+            inputs=inputs,
+            outputs=outputs,
+            custom_properties=custom_properties,
+        )
+        self.slack = slack
+        self.v_max = v_max
+        self.v_min = v_min

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/components/_converter.py

@@ -101,13 +101,9 @@ class Converter(Node):
         conversion_factors=None,
         custom_attributes=None,
     ):
-        self.label = label
-
         if inputs is None:
-            warn_if_missing_attribute(self, "inputs")
             inputs = {}
         if outputs is None:
-            warn_if_missing_attribute(self, "outputs")
             outputs = {}
 
         if custom_attributes is None:
@@ -117,8 +113,12 @@ class Converter(Node):
             label=label,
             inputs=inputs,
             outputs=outputs,
-            **custom_attributes,
+            custom_properties=custom_attributes,
         )
+        if not inputs:
+            warn_if_missing_attribute(self, "inputs")
+        if not outputs:
+            warn_if_missing_attribute(self, "outputs")
 
         if conversion_factors is None:
             conversion_factors = {}

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/components/_generic_storage.py

@@ -193,10 +193,10 @@ class GenericStorage(Node):
         if custom_attributes is None:
             custom_attributes = {}
         super().__init__(
-            label=label,
+            label,
             inputs=inputs,
             outputs=outputs,
-            **custom_attributes,
+            custom_properties=custom_attributes,
         )
         # --- BEGIN: The following code can be removed for versions >= v0.6 ---
         if investment is not None:
@@ -1869,7 +1869,7 @@ class GenericInvestmentStorageBlock(ScalarBlock):
                                 m.es.periods_years[p],
                                 range_limit,
                             )
-                        ) * (1 + m.discount_rate) ** (-m.es.periods_years[p])
+                        )
 
             for n in self.EXISTING_INVESTSTORAGES:
                 if n.investment.fixed_costs[0] is not None:

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/components/_link.py

@@ -86,23 +86,26 @@ class Link(Node):
         conversion_factors=None,
         custom_attributes=None,
     ):
+        # compatibility with omeof.network w/o explicit named arguments
         if inputs is None:
-            warn_if_missing_attribute(self, "inputs")
             inputs = {}
         if outputs is None:
-            warn_if_missing_attribute(self, "outputs")
             outputs = {}
-        if conversion_factors is None:
-            warn_if_missing_attribute(self, "conversion_factors")
-            conversion_factors = {}
         if custom_attributes is None:
             custom_attributes = {}
         super().__init__(
-            label=label,
+            label,
             inputs=inputs,
             outputs=outputs,
-            **custom_attributes,
+            custom_properties=custom_attributes,
         )
+        if not inputs:
+            warn_if_missing_attribute(self, "inputs")
+        if not outputs:
+            warn_if_missing_attribute(self, "outputs")
+        if conversion_factors is None:
+            warn_if_missing_attribute(self, "conversion_factors")
+            conversion_factors = {}
         self.conversion_factors = {
             k: sequence(v) for k, v in conversion_factors.items()
         }

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/components/experimental/_generic_caes.py

@@ -97,18 +97,32 @@ class GenericCAES(Node):
     <class 'oemof.solph.components.experimental._generic_caes.GenericCAES'>
     """
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.electrical_input = kwargs.get("electrical_input")
-        self.fuel_input = kwargs.get("fuel_input")
-        self.electrical_output = kwargs.get("electrical_output")
-        self.params = kwargs.get("params")
+    def __init__(
+        self,
+        label,
+        *,
+        electrical_input,
+        fuel_input,
+        electrical_output,
+        params,
+        custom_properties=None,
+    ):
+        super().__init__(
+            label=label,
+            inputs={},
+            outputs={},
+            custom_properties=custom_properties,
+        )
+
+        self.electrical_input = electrical_input
+        self.fuel_input = fuel_input
+        self.electrical_output = electrical_output
+        self.params = params
 
         # map specific flows to standard API
-        self.inputs.update(kwargs.get("electrical_input"))
-        self.inputs.update(kwargs.get("fuel_input"))
-        self.outputs.update(kwargs.get("electrical_output"))
+        self.inputs.update(electrical_input)
+        self.inputs.update(fuel_input)
+        self.outputs.update(electrical_output)
 
     def constraint_group(self):
         return GenericCAESBlock

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/components/experimental/_piecewise_linear_converter.py

@@ -66,12 +66,27 @@ class PiecewiseLinearConverter(Node):
 PiecewiseLinearConverter'>
     """
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(
+        self,
+        label,
+        *,
+        inputs,
+        outputs,
+        conversion_function,
+        in_breakpoints,
+        pw_repn,
+        custom_properties=None,
+    ):
+        super().__init__(
+            label,
+            inputs=inputs,
+            outputs=outputs,
+            custom_properties=custom_properties,
+        )
 
-        self.in_breakpoints = list(kwargs.get("in_breakpoints"))
-        self.conversion_function = kwargs.get("conversion_function")
-        self.pw_repn = kwargs.get("pw_repn")
+        self.in_breakpoints = list(in_breakpoints)
+        self.conversion_function = conversion_function
+        self.pw_repn = pw_repn
 
         if len(self.inputs) > 1 or len(self.outputs) > 1:
             raise ValueError(

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/components/experimental/_sink_dsm.py

@@ -1447,7 +1447,7 @@ class SinkDSMOemofInvestmentBlock(ScalarBlock):
                                 m.es.periods_years[p],
                                 range_limit,
                             )
-                        ) * (1 + m.discount_rate) ** (-m.es.periods_years[p])
+                        )
 
             for g in self.EXISTING_INVESTDSM:
                 if g.investment.fixed_costs[0] is not None:
@@ -3301,7 +3301,7 @@ class SinkDSMDIWInvestmentBlock(ScalarBlock):
                                 m.es.periods_years[p],
                                 range_limit,
                             )
-                        ) * (1 + m.discount_rate) ** (-m.es.periods_years[p])
+                        )
 
             for g in self.EXISTING_INVESTDSM:
                 if g.investment.fixed_costs[0] is not None:
@@ -5800,7 +5800,7 @@ class SinkDSMDLRInvestmentBlock(ScalarBlock):
                                 m.es.periods_years[p],
                                 range_limit,
                             )
-                        ) * (1 + m.discount_rate) ** (-m.es.periods_years[p])
+                        )
 
             for g in self.EXISTING_INVESTDSM:
                 if g.investment.fixed_costs[0] is not None:

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/constraints/equate_variables.py

@@ -62,8 +62,11 @@ def equate_variables(model, var1, var2, factor1=1, name=None):
 
     >>> import pandas as pd
     >>> from oemof import solph
-    >>> date_time_index = pd.date_range('1/1/2012', periods=5, freq='H')
-    >>> energysystem = solph.EnergySystem(timeindex=date_time_index)
+    >>> date_time_index = pd.date_range('1/1/2012', periods=6, freq='H')
+    >>> energysystem = solph.EnergySystem(
+    ...     timeindex=date_time_index,
+    ...     infer_last_interval=False,
+    ... )
     >>> bel1 = solph.buses.Bus(label='electricity1')
     >>> bel2 = solph.buses.Bus(label='electricity2')
     >>> energysystem.add(bel1, bel2)

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/constraints/integral_limit.py

@@ -102,8 +102,11 @@ def generic_integral_limit(om, keyword, flows=None, limit=None):
     --------
     >>> import pandas as pd
     >>> from oemof import solph
-    >>> date_time_index = pd.date_range('1/1/2012', periods=5, freq='H')
-    >>> energysystem = solph.EnergySystem(timeindex=date_time_index)
+    >>> date_time_index = pd.date_range('1/1/2012', periods=6, freq='H')
+    >>> energysystem = solph.EnergySystem(
+    ...     timeindex=date_time_index,
+    ...     infer_last_interval=False,
+    ... )
     >>> bel = solph.buses.Bus(label='electricityBus')
     >>> flow1 = solph.flows.Flow(
     ...     nominal_value=100,

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/constraints/investment_limit.py

@@ -171,8 +171,11 @@ def additional_investment_flow_limit(model, keyword, limit=None):
     --------
     >>> import pandas as pd
     >>> from oemof import solph
-    >>> date_time_index = pd.date_range('1/1/2020', periods=5, freq='H')
-    >>> es = solph.EnergySystem(timeindex=date_time_index)
+    >>> date_time_index = pd.date_range('1/1/2020', periods=6, freq='H')
+    >>> es = solph.EnergySystem(
+    ...     timeindex=date_time_index,
+    ...     infer_last_interval=False,
+    ... )
     >>> bus = solph.buses.Bus(label='bus_1')
     >>> sink = solph.components.Sink(label="sink", inputs={bus:
     ...     solph.flows.Flow(nominal_value=10, fix=[10, 20, 30, 40, 50])})

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/constraints/shared_limit.py

@@ -60,8 +60,11 @@ def shared_limit(
 
     >>> import pandas as pd
     >>> from oemof import solph
-    >>> date_time_index = pd.date_range('1/1/2012', periods=5, freq='H')
-    >>> energysystem = solph.EnergySystem(timeindex=date_time_index)
+    >>> date_time_index = pd.date_range('1/1/2012', periods=6, freq='H')
+    >>> energysystem = solph.EnergySystem(
+    ...     timeindex=date_time_index,
+    ...     infer_last_interval=False,
+    ... )
     >>> b1 = solph.buses.Bus(label="Party1Bus")
     >>> b2 = solph.buses.Bus(label="Party2Bus")
     >>> storage1 = solph.components.GenericStorage(

{oemof.solph-0.5.2.dev1 → oemof.solph-0.5.2.dev2}/src/oemof/solph/flows/_investment_flow_block.py

@@ -1022,11 +1022,8 @@ class InvestmentFlowBlock(ScalarBlock):
                             self.invest[i, o, p]
                             * m.flows[i, o].investment.fixed_costs[pp]
                             * (1 + m.discount_rate) ** (-pp)
-                            for pp in range(
-                                m.es.periods_years[p],
-                                range_limit,
-                            )
-                        ) * (1 + m.discount_rate) ** (-m.es.periods_years[p])
+                            for pp in range(m.es.periods_years[p], range_limit)
+                        )
 
             for i, o in self.EXISTING_INVESTFLOWS:
                 if m.flows[i, o].investment.fixed_costs[0] is not None: