Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: update user constraint generation #481

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
+96 −112
Draft

WIP: update user constraint generation #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7b3274
WIP: update unser constraint generation
mihlema Aug 23, 2022
241193d
Updating template to `null` user coefficients
mihlema Aug 23, 2022
8dfbc11
WIP Debugging
mihlema Aug 23, 2022
9a54e75
More debugging
mihlema Aug 23, 2022
068ff5a
Updated constraint_user_constraint.jl
mihlema Aug 23, 2022
c44cf51
removed @show from debugging
mihlema Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 82 additions & 98 deletions src/constraints/constraint_user_constraint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ function add_constraint_user_constraint!(m::Model)
(unit=u, node=n, user_constraint=uc, direction=d, i=op, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short)
for (u, n) in unit__from_node__user_constraint(user_constraint=uc, direction=direction(:from_node))
for (u, n, uc, d) in indices(unit_flow_coefficient;user_constraint=uc)
for (u, n, d, op, s, t_short) in unit_flow_op_indices(
m;
unit=u,
node=n,
direction=direction(:from_node),
direction=d,
stochastic_scenario=s,
t=t_in_t(m; t_long=t),
);
Expand All @@ -64,46 +64,12 @@ function add_constraint_user_constraint!(m::Model)
(unit=u, node=n, user_constraint=uc, direction=d, i=1, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short)
for (u, n) in unit__from_node__user_constraint(user_constraint=uc, direction=direction(:from_node))
for (u, n, uc, d) in indices(unit_flow_coefficient;user_constraint=uc)
for (u, n, d, s, t_short) in unit_flow_indices(
m;
unit=u,
node=n,
direction=direction(:from_node),
stochastic_scenario=s,
t=t_in_t(m; t_long=t),
) if isempty(unit_flow_op_indices(m; unit=u, node=n, direction=d, t=t_short));
init=0,
)
+ expr_sum(
+ unit_flow_op[u, n, d, op, s, t_short]
* unit_flow_coefficient[
(unit=u, node=n, user_constraint=uc, direction=d, i=op, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short)
for (u, n) in unit__to_node__user_constraint(user_constraint=uc, direction=direction(:to_node))
for (u, n, d, op, s, t_short) in unit_flow_op_indices(
m;
unit=u,
node=n,
direction=direction(:to_node),
stochastic_scenario=s,
t=t_in_t(m; t_long=t),
);
init=0,
)
+ expr_sum(
+ unit_flow[u, n, d, s, t_short]
* unit_flow_coefficient[
(unit=u, node=n, user_constraint=uc, direction=d, i=1, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short)
for (u, n) in unit__to_node__user_constraint(user_constraint=uc, direction=direction(:to_node))
for (u, n, d, s, t_short) in unit_flow_indices(
m;
unit=u,
node=n,
direction=direction(:to_node),
direction=d,
stochastic_scenario=s,
t=t_in_t(m; t_long=t),
) if isempty(unit_flow_op_indices(m; unit=u, node=n, direction=d, t=t_short));
Expand All @@ -113,76 +79,94 @@ function add_constraint_user_constraint!(m::Model)
(
+ units_on[u, s, t1]
* units_on_coefficient[(user_constraint=uc, unit=u, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t))
for (u, uc) in indices(units_on_coefficient;user_constraint=uc)
for (u, s, t1) in units_on_indices(m; unit=u, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
+ expr_sum(
(
+ units_started_up[u, s, t1]
* units_started_up_coefficient[(user_constraint=uc, unit=u, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t))
for u in unit__user_constraint(user_constraint=uc)
for (u, uc) in indices(units_started_up_coefficient;user_constraint=uc)
for (u, s, t1) in units_on_indices(m; unit=u, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
)
+ expr_sum(
(
+ units_invested_available[u, s, t1]
* units_invested_available_coefficient[(user_constraint=uc, unit=u, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t))
for (u, uc) in indices(units_invested_available_coefficient;user_constraint=uc)
for (u, s, t1) in units_invested_available_indices(m; unit=u, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
+ expr_sum(
(
+ units_invested[u, s, t1]
* units_invested_coefficient[(user_constraint=uc, unit=u, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t)) for u in unit__user_constraint(user_constraint=uc)
* min(duration(t1), duration(t))
for (u, uc) in indices(units_invested_coefficient;user_constraint=uc)
for (u, s, t1) in units_invested_available_indices(m; unit=u, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
+ expr_sum(
(
+ connections_invested_available[c, s, t1]
* connections_invested_available_coefficient[(user_constraint=uc, connection=c, stochastic_scenario=s, analysis_time=t0, t=t1)]
* connections_invested_available_coefficient[(user_constraint=uc, connection=c, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t))
for (c, uc) in indices(connections_invested_available_coefficient;user_constraint=uc)
for (c, s, t1) in connections_invested_available_indices(m; connection=c, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
+ expr_sum(
(
+ connections_invested[c, s, t1]
* connections_invested_coefficient[(user_constraint=uc, connection=c, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t)) for c in connection__user_constraint(user_constraint=uc)
* min(duration(t1), duration(t))
for (c, uc) in indices(connections_invested_coefficient;user_constraint=uc)
for (c, s, t1) in connections_invested_available_indices(m; connection=c, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
+ expr_sum(
(
+ storages_invested_available[n, s, t1]
* storages_invested_available_coefficient[(user_constraint=uc, node=n, stochastic_scenario=s, analysis_time=t0, t=t1)]
+ storages_invested[n, s, t1]
* storages_invested_coefficient[(user_constraint=uc, node=n, stochastic_scenario=s, analysis_time=t0, t=t1)]
* storages_invested_available_coefficient[(user_constraint=uc, node=n, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t)) for n in node__user_constraint(user_constraint=uc)
* min(duration(t1), duration(t))
for (n,uc) in indices(storages_invested_available_coefficient; user_constraint=uc)
for (n, s, t1) in storages_invested_available_indices(m; node=n, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
)
+ expr_sum(
+ connection_flow[c, n, d, s, t_short]
* connection_flow_coefficient[
(connection=c, node=n, user_constraint=uc, direction=d, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short)
for (c, n) in connection__from_node__user_constraint(user_constraint=uc, direction=direction(:from_node))
for (c, n, d, s, t_short) in connection_flow_indices(
m;
connection=c,
node=n,
direction=direction(:from_node),
stochastic_scenario=s,
t=t_in_t(m; t_long=t),
);
(
+ storages_invested[n, s, t1]
* storages_invested_coefficient[(user_constraint=uc, node=n, stochastic_scenario=s, analysis_time=t0, t=t1)]
)
* min(duration(t1), duration(t))
for (n,uc) in indices(storages_invested_coefficient; user_constraint=uc)
for (n, s, t1) in storages_invested_available_indices(m; node=n, stochastic_scenario=s, t=t_overlaps_t(m; t=t));
init=0,
)
)
+ expr_sum(
+ connection_flow[c, n, d, s, t_short]
* connection_flow_coefficient[
(connection=c, node=n, user_constraint=uc, direction=d, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short)
for (c, n) in connection__to_node__user_constraint(user_constraint=uc, direction=direction(:to_node))
for (c, n, uc, d) in indices(connection_flow_coefficient;user_constraint=uc)
for (c, n, d, s, t_short) in connection_flow_indices(
m;
connection=c,
node=n,
direction=direction(:to_node),
direction=d,
stochastic_scenario=s,
t=t_in_t(m; t_long=t),
);
Expand All @@ -193,14 +177,16 @@ function add_constraint_user_constraint!(m::Model)
* node_state_coefficient[
(node=n, user_constraint=uc, stochastic_scenario=s, analysis_time=t0, t=t_short),
]
* duration(t_short) for n in indices(node_state_coefficient; user_constraint=uc)
* duration(t_short)
for (n,uc) in indices(node_state_coefficient; user_constraint=uc)
for (n, s, t_short) in node_state_indices(m; node=n, stochastic_scenario=s, t=t_in_t(m; t_long=t));
init=0,
)
+ expr_sum(
+ demand[(node=n, stochastic_scenario=s, analysis_time=t0, t=t)]
* demand_coefficient[(node=n, user_constraint=uc, stochastic_scenario=s, analysis_time=t0, t=t)]
* duration(t_short) for n in node__user_constraint(user_constraint=uc)
* duration(t_short)
for (n,uc) in indices(demand_coefficient; user_constraint=uc)
for (ns, s, t_short) in node_stochastic_time_indices(
m;
node=n,
Expand Down Expand Up @@ -263,11 +249,8 @@ Gather the `unit_flow` variable indices appearing in `add_constraint_user_constr
function _constraint_user_constraint_unit_flow_indices(m, uc, t)
(
ind
for (unit__node__user_constraint, d) in (
(unit__from_node__user_constraint, :from_node), (unit__to_node__user_constraint, :to_node)
)
for (u, n) in unit__node__user_constraint(user_constraint=uc)
for ind in unit_flow_indices(m; unit=u, node=n, direction=direction(d), t=t)
for (u, n, uc, d) in indices(unit_flow_coefficient;user_constraint=uc)
for ind in unit_flow_indices(m; unit=u, node=n, direction=d, t=t)
)
end

Expand All @@ -279,7 +262,11 @@ Gather the `units_on` variable indices appearing in `add_constraint_user_constra
function _constraint_user_constraint_units_on_indices(m, uc, t)
(
ind
for u in unit__user_constraint(user_constraint=uc) for ind in units_on_indices(m; unit=u, t=t)
for (u, uc) in unique(Iterators.flatten((
indices(units_on_coefficient;user_constraint=uc),
indices(units_started_up_coefficient;user_constraint=uc),
)))
for ind in units_on_indices(m; unit=u, t=t)
)
end

Expand All @@ -291,29 +278,12 @@ Gather the `connection_flow` variable indices appearing in `add_constraint_user_
function _constraint_user_constraint_connection_flow_indices(m, uc, t)
(
ind
for (connection__node__user_constraint, d) in (
(connection__from_node__user_constraint, :from_node), (connection__to_node__user_constraint, :to_node)
)
for (c, n) in connection__node__user_constraint(user_constraint=uc)
for ind in connection_flow_indices(m; connection=c, node=n, direction=direction(d), t=t)
)
end

"""
_constraint_user_constraint_node_state_indices(uc, t)

Gather the `node_state` variable indices appearing in `add_constraint_user_constraint!`.
"""
function _constraint_user_constraint_node_state_indices(m, uc, t)
(
ind
for n in node__user_constraint(user_constraint=uc)
for ind in node_state_indices(m; node=n, t=t)
for (conn, n, uc, d) in indices(connection_flow_coefficient;user_constraint=uc)
for ind in connection_flow_indices(m; connection=conn, node=n, direction=d, t=t)
)
end




"""
_constraint_user_constraint_units_invested_indices(uc, t)

Expand All @@ -322,7 +292,11 @@ Gather the `units_invested` variable indices appearing in `add_constraint_user_c
function _constraint_user_constraint_units_invested_indices(m, uc, t)
(
ind
for u in unit__user_constraint(user_constraint=uc) for ind in units_invested_available_indices(m; unit=u, t=t)
for (u, uc) in unique(Iterators.flatten((
indices(units_invested_available_coefficient;user_constraint=uc),
indices(units_invested_coefficient;user_constraint=uc),
)))
for ind in units_invested_available_indices(m; unit=u, t=t)
)
end

Expand All @@ -335,7 +309,11 @@ Gather the `connections_invested` variable indices appearing in `add_constraint_
function _constraint_user_constraint_connections_invested_indices(m, uc, t)
(
ind
for c in connection__user_constraint(user_constraint=uc) for ind in connections_invested_available_indices(m; connection=c, t=t)
for (conn, uc) in unique(Iterators.flatten((
indices(connections_invested_available_coefficient;user_constraint=uc),
indices(connections_invested_coefficient;user_constraint=uc),
)))
for ind in connections_invested_available_indices(m; connection=conn, t=t)
)
end

Expand All @@ -347,7 +325,11 @@ Gather the `storages_invested` variable indices appearing in `add_constraint_use
function _constraint_user_constraint_storages_invested_indices(m, uc, t)
(
ind
for n in node__user_constraint(user_constraint=uc) for ind in storages_invested_available_indices(m; node=n, t=t)
for (n, uc) in unique(Iterators.flatten((
indices(storages_invested_available_coefficient;user_constraint=uc),
indices(storages_invested_coefficient;user_constraint=uc),
)))
for ind in storages_invested_available_indices(m; node=n, t=t)
)
end

Expand All @@ -360,7 +342,10 @@ Gather the `node_stochastic_time_indices` indices appearing in `add_constraint_u
function _constraint_user_constraint_node_stochastic_time_indices(m, uc, t)
(
ind
for n in node__user_constraint(user_constraint=uc)
for (n, uc) in unique(Iterators.flatten((
indices(node_state_coefficient;user_constraint=uc),
indices(demand_coefficient;user_constraint=uc),
)))
for ind in node_stochastic_time_indices(m; node=n, t=t)
)
end
Expand All @@ -376,7 +361,6 @@ function _constraint_user_constraint_indices(m, uc, t=anything)
_constraint_user_constraint_unit_flow_indices(m, uc, t),
_constraint_user_constraint_units_on_indices(m, uc, t),
_constraint_user_constraint_connection_flow_indices(m, uc, t),
_constraint_user_constraint_node_state_indices(m, uc, t),
_constraint_user_constraint_node_stochastic_time_indices(m, uc, t),
_constraint_user_constraint_units_invested_indices(m, uc, t),
_constraint_user_constraint_connections_invested_indices(m, uc, t),
Expand Down
Loading