Skip to content

Commit

Permalink
Rename quadratic2 and quadratic in wnd.py
Browse files Browse the repository at this point in the history
  • Loading branch information
tristantc committed Oct 10, 2024
1 parent 493365f commit 3d68a25
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gdplib/water_network/wnd.py
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ def unit_exists_or_not(m, unit):

# Approximation of the concave capital cost term for the active treatment units in the objective function.

if approximation == 'quadratic':
if approximation == 'quadratic_zero_origin':
# New variable for potential term in capital cost. Z = sum(Q)**0.7, Z >= 0
unit_exists.cost_var = pyo.Var(
m.TU,
Expand Down Expand Up @@ -676,7 +676,7 @@ def _cost_nv(unit_exists):
== unit_exists.flow[mt, unit]
)

elif approximation == "quadratic2":
elif approximation == "quadratic_nonzero_origin":

def _func2(x, a, b, c):
"""This function computes the quadratic curve fit.
Expand Down

0 comments on commit 3d68a25

Please sign in to comment.