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

Jump to bottom

transport network cons put under NETWORK #201

Merged
merged 1 commit into from
Dec 1, 2023
Merged

transport network cons put under NETWORK #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions src/energiapy/components/scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,25 +378,6 @@ def __post_init__(self):

}

if isinstance(self.network, Network):
transport_set_dict = {
'transports_certain_capacity': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_CAPACITY in i.varying],
'transports_certain_capex': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_CAPEX in i.varying],
'transports_certain_vopex': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_VOPEX in i.varying],
'transports_certain_fopex': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_FOPEX in i.varying],

'transports_uncertain_capacity': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_CAPACITY in i.varying],
'transports_uncertain_capex': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_CAPEX in i.varying],
'transports_uncertain_vopex': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_VOPEX in i.varying],
'transports_uncertain_fopex': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_FOPEX in i.varying],

'transports_varying_capacity': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_CAPACITY in i.varying],
'transports_varying_capex': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_CAPEX in i.varying],
'transports_varying_vopex': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_VOPEX in i.varying],
'transports_varying_fopex': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_FOPEX in i.varying],
}
self.set_dict = {**self.set_dict, **transport_set_dict}

self.varying_bounds_dict = {
'demand': {i.name: i.varying_bounds for i in self.resource_set if VaryingResource.UNCERTAIN_DEMAND in i.varying},
'availability': {i.name: i.varying_bounds for i in self.resource_set if VaryingResource.UNCERTAIN_AVAILABILITY in i.varying},
Expand Down Expand Up @@ -427,6 +408,25 @@ def __post_init__(self):
set_dict['resources_trans'] = []

self.set_dict = {x: sorted(set_dict[x]) for x in set_dict.keys()}

if isinstance(self.network, Network):
transport_set_dict = {
'transports_certain_capacity': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_CAPACITY in i.varying],
'transports_certain_capex': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_CAPEX in i.varying],
'transports_certain_vopex': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_VOPEX in i.varying],
'transports_certain_fopex': [i.name for i in self.transport_set if VaryingTransport.CERTAIN_FOPEX in i.varying],

'transports_uncertain_capacity': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_CAPACITY in i.varying],
'transports_uncertain_capex': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_CAPEX in i.varying],
'transports_uncertain_vopex': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_VOPEX in i.varying],
'transports_uncertain_fopex': [i.name for i in self.transport_set if VaryingTransport.UNCERTAIN_FOPEX in i.varying],

'transports_varying_capacity': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_CAPACITY in i.varying],
'transports_varying_capex': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_CAPEX in i.varying],
'transports_varying_vopex': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_VOPEX in i.varying],
'transports_varying_fopex': [i.name for i in self.transport_set if VaryingTransport.DETERMINISTIC_FOPEX in i.varying],
}
self.set_dict = {**self.set_dict, **transport_set_dict}

def make_conversion_df(self) -> DataFrame:
"""makes a DataFrame of the conversion values
Expand Down
76 changes: 76 additions & 0 deletions src/energiapy/model/constraints/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,82 @@ def transport_capacity_UB_rule(instance, source, sink, transport, *scale_list):
return instance.constraint_transport_capacity_UB



def constraint_transport_capacity_LB_no_bin(instance: ConcreteModel, network_scale_level: int = 0,
trans_min: dict = None, transport_avail_dict: dict = None) -> Constraint:
"""Minimum capacity bound for transport mode

Args:
instance (ConcreteModel): pyomo model instance
network_scale_level (int, optional): scale of network decisions. Defaults to 0.
trans_max (dict, optional): Maximum allowed transportation. Defaults to {}.
transport_avail_dict (dict, optional): Modes of transportation available between locations. Defaults to {}.

Returns:
Constraint: transport_capacity_LB_no_bin
"""

if trans_min is None:
trans_min = dict()

if transport_avail_dict is None:
transport_avail_dict = dict()

scales = scale_list(instance=instance,
scale_levels=network_scale_level + 1)

def transport_capacity_LB_no_bin_rule(instance, source, sink, transport, *scale_list):
if transport in transport_avail_dict[(source, sink)]:
return instance.Cap_F[source, sink, transport, scale_list[:network_scale_level + 1]] >= \
trans_min[transport]
else:
return instance.Cap_F[source, sink, transport, scale_list[:network_scale_level + 1]] == 0

instance.constraint_transport_capacity_LB_no_bin = Constraint(instance.sources, instance.sinks,
instance.transports, *scales, rule=transport_capacity_LB_no_bin_rule,
doc='LB_no_bin for transport capacity')
constraint_latex_render(transport_capacity_LB_no_bin_rule)
return instance.constraint_transport_capacity_LB_no_bin


def constraint_transport_capacity_UB_no_bin(instance: ConcreteModel, network_scale_level: int = 0,
trans_max: dict = None, transport_avail_dict: dict = None) -> Constraint:
"""Maximum capacity bound for transport mode

Args:
instance (ConcreteModel): pyomo model instance
network_scale_level (int, optional): scale of network decisions. Defaults to 0.
trans_max (dict, optional): Maximum allowed transportation. Defaults to {}.
transport_avail_dict (dict, optional): Modes of transportation available between locations. Defaults to {}.

Returns:
Constraint: transport_capacity_UB_no_bin
"""

if trans_max is None:
trans_max = dict()

if transport_avail_dict is None:
transport_avail_dict = dict()

scales = scale_list(instance=instance,
scale_levels=network_scale_level + 1)

def transport_capacity_UB_no_bin_rule(instance, source, sink, transport, *scale_list):
if transport in transport_avail_dict[(source, sink)]:
return instance.Cap_F[source, sink, transport, scale_list[:network_scale_level + 1]] <= \
trans_max[transport] * instance.X_F[source, sink,
transport, scale_list[:network_scale_level + 1]]
else:
return instance.Cap_F[source, sink, transport, scale_list[:network_scale_level + 1]] == 0

instance.constraint_transport_capacity_UB_no_bin = Constraint(instance.sources, instance.sinks,
instance.transports, *scales, rule=transport_capacity_UB_no_bin_rule,
doc='UB_no_bin for transport capacity')
constraint_latex_render(transport_capacity_UB_no_bin_rule)
return instance.constraint_transport_capacity_UB_no_bin


def constraint_transport_capex(instance: ConcreteModel, trans_capex: dict, distance_dict: dict, transport_avail_dict: dict, network_scale_level: int = 0):
"""_summary_

Expand Down
22 changes: 17 additions & 5 deletions src/energiapy/model/formulate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@
constraint_transport_vopex,
constraint_transport_network_vopex,
constraint_transport_fopex,
constraint_transport_network_fopex
constraint_transport_network_fopex,
constraint_transport_capacity_UB_no_bin,
constraint_transport_capacity_LB_no_bin
)
from .constraints.uncertain import (
constraint_uncertain_process_capacity,
Expand Down Expand Up @@ -575,10 +577,6 @@ def formulate(scenario: Scenario, constraints: Set[Constraints] = None, objectiv
constraint_export(instance=instance, scheduling_scale_level=scenario.scheduling_scale_level,
network_scale_level=scenario.network_scale_level, location_transport_resource_dict=scenario.location_transport_resource_dict,
transport_capacity_factor=scenario.transport_capacity_factor, transport_capacity_scale_level=scenario.transport_capacity_scale_level)
constraint_transport_capacity_UB(instance=instance, network_scale_level=scenario.network_scale_level,
transport_avail_dict=scenario.transport_avail_dict, trans_max=scenario.trans_max)
constraint_transport_capacity_LB(instance=instance, network_scale_level=scenario.network_scale_level,
transport_avail_dict=scenario.transport_avail_dict, trans_min=scenario.trans_min)

constraint_transport_capex(instance=instance, trans_capex=scenario.trans_capex, distance_dict=scenario.distance_dict,
transport_avail_dict=scenario.transport_avail_dict, network_scale_level=scenario.network_scale_level)
Expand All @@ -597,6 +595,11 @@ def formulate(scenario: Scenario, constraints: Set[Constraints] = None, objectiv
transport_avail_dict=scenario.transport_avail_dict, network_scale_level=scenario.network_scale_level)
constraint_transport_network_fopex(
instance=instance, network_scale_level=scenario.network_scale_level)

constraint_transport_capacity_UB_no_bin(instance=instance, network_scale_level=scenario.network_scale_level,
transport_avail_dict=scenario.transport_avail_dict, trans_max=scenario.trans_max)
constraint_transport_capacity_LB_no_bin(instance=instance, network_scale_level=scenario.network_scale_level,
transport_avail_dict=scenario.transport_avail_dict, trans_min=scenario.trans_min)
# constraint_transport_import(instance=instance, scheduling_scale_level=scenario.scheduling_scale_level,
# transport_avail_dict=scenario.transport_avail_dict)
# constraint_transport_exp_UB(instance=instance, scheduling_scale_level=scenario.scheduling_scale_level,
Expand Down Expand Up @@ -639,7 +642,16 @@ def formulate(scenario: Scenario, constraints: Set[Constraints] = None, objectiv

instance.del_component(instance.constraint_storage_min)
instance.del_component(instance.constraint_production_min)


if len(scenario.location_set) > 1:
constraint_transport_capacity_UB(instance=instance, network_scale_level=scenario.network_scale_level,
transport_avail_dict=scenario.transport_avail_dict, trans_max=scenario.trans_max)
constraint_transport_capacity_LB(instance=instance, network_scale_level=scenario.network_scale_level,
transport_avail_dict=scenario.transport_avail_dict, trans_min=scenario.trans_min)

instance.del_component(instance.constraint_transport_capacity_UB_no_bin)
instance.del_component(instance.constraint_transport_capacity_LB_no_bin)
if Constraints.PRESERVE_NETWORK in constraints:

constraint_preserve_capacity_facility(
Expand Down