Skip to content

Commit

Permalink
Alter identation
Browse files Browse the repository at this point in the history
  • Loading branch information
jokochems committed Oct 6, 2023
1 parent f6f9a4d commit b4010c8
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 43 deletions.
40 changes: 20 additions & 20 deletions src/oemof/solph/components/_generic_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -926,27 +926,27 @@ class GenericInvestmentStorageBlock(ScalarBlock):
\cdot DF^{-pp}
whereby:
whereby:
* :math:`A(c_{invest,var}(p), l, ir)` A is the annuity for
investment expenses :math:`c_{invest,var}(p)`, lifetime :math:`l`
and interest rate :math:`ir`.
* :math:`ANF(d, dr)` is the annuity factor for duration :math:`d`
and discount rate :math:`dr`.
* :math:`d=min\{year_{max} - year(p), l\}` defines the
number of years within the optimization horizon that investment
annuities are accounted for.
* :math:`year(p)` denotes the start year of period :math:`p`.
* :math:`year_{max}` denotes the last year of the optimization
horizon, i.e. at the end of the last period.
* :math:`limit_{end}=min\{year_{max}, year(p) + l\}` is used as an
upper bound to ensure fixed costs for endogenous investments
to occur within the optimization horizon.
* :math:`limit_{exo}=min\{year_{max}, l - a\}` is used as an
upper bound to ensure fixed costs for existing capacities to occur
within the optimization horizon. :math:`a` is the initial age
of an asset.
* :math:`DF=(1+dr)` is the discount factor.
* :math:`A(c_{invest,var}(p), l, ir)` A is the annuity for
investment expenses :math:`c_{invest,var}(p)`, lifetime :math:`l`
and interest rate :math:`ir`.
* :math:`ANF(d, dr)` is the annuity factor for duration :math:`d`
and discount rate :math:`dr`.
* :math:`d=min\{year_{max} - year(p), l\}` defines the
number of years within the optimization horizon that investment
annuities are accounted for.
* :math:`year(p)` denotes the start year of period :math:`p`.
* :math:`year_{max}` denotes the last year of the optimization
horizon, i.e. at the end of the last period.
* :math:`limit_{end}=min\{year_{max}, year(p) + l\}` is used as an
upper bound to ensure fixed costs for endogenous investments
to occur within the optimization horizon.
* :math:`limit_{exo}=min\{year_{max}, l - a\}` is used as an
upper bound to ensure fixed costs for existing capacities to occur
within the optimization horizon. :math:`a` is the initial age
of an asset.
* :math:`DF=(1+dr)` is the discount factor.
The annuity / annuity factor hereby is:
Expand Down
46 changes: 23 additions & 23 deletions src/oemof/solph/flows/_investment_flow_block.py
Original file line number Diff line number Diff line change
Expand Up @@ -815,27 +815,27 @@ def _objective_expression(self):
\cdot DF^{-pp}
whereby:
* :math:`A(c_{invest,var}(p), l, ir)` A is the annuity for
investment expenses :math:`c_{invest,var}(p)`, lifetime :math:`l`
and interest rate :math:`ir`.
* :math:`ANF(d, dr)` is the annuity factor for duration :math:`d`
and discount rate :math:`dr`.
* :math:`d=min\{year_{max} - year(p), l\}` defines the
number of years within the optimization horizon that investment
annuities are accounted for.
* :math:`year(p)` denotes the start year of period :math:`p`.
* :math:`year_{max}` denotes the last year of the optimization
horizon, i.e. at the end of the last period.
* :math:`limit_{end}=min\{year_{max}, year(p) + l\}` is used as an
upper bound to ensure fixed costs for endogenous investments
to occur within the optimization horizon.
* :math:`limit_{exo}=min\{year_{max}, l - a\}` is used as an
upper bound to ensure fixed costs for existing capacities to occur
within the optimization horizon. :math:`a` is the initial age
of an asset.
* :math:`DF=(1+dr)` is the discount factor.
whereby:
* :math:`A(c_{invest,var}(p), l, ir)` A is the annuity for
investment expenses :math:`c_{invest,var}(p)`, lifetime :math:`l`
and interest rate :math:`ir`.
* :math:`ANF(d, dr)` is the annuity factor for duration :math:`d`
and discount rate :math:`dr`.
* :math:`d=min\{year_{max} - year(p), l\}` defines the
number of years within the optimization horizon that investment
annuities are accounted for.
* :math:`year(p)` denotes the start year of period :math:`p`.
* :math:`year_{max}` denotes the last year of the optimization
horizon, i.e. at the end of the last period.
* :math:`limit_{end}=min\{year_{max}, year(p) + l\}` is used as an
upper bound to ensure fixed costs for endogenous investments
to occur within the optimization horizon.
* :math:`limit_{exo}=min\{year_{max}, l - a\}` is used as an
upper bound to ensure fixed costs for existing capacities to occur
within the optimization horizon. :math:`a` is the initial age
of an asset.
* :math:`DF=(1+dr)` is the discount factor.
The annuity / annuity factor hereby is:
Expand All @@ -847,8 +847,8 @@ def _objective_expression(self):
&
ANF(d, dr)=\frac {(1+dr)^d \cdot dr} {(1+dr)^d - 1}
They are retrieved, using oemof.tools.economics annuity function. The
interest rate :math:`i` for the annuity is defined as weighted
They are retrieved, using oemof.tools.economics annuity function.
The interest rate :math:`i` for the annuity is defined as weighted
average costs of capital (wacc) and assumed constant over time.
"""
if not hasattr(self, "INVESTFLOWS"):
Expand Down

0 comments on commit b4010c8

Please sign in to comment.