mirror of
https://github.com/ANL-CEEESA/UnitCommitment.jl.git
synced 2025-12-07 08:48:51 -06:00
UnitCommitmentInstance: add _by_name fields
This commit is contained in:
@@ -266,15 +266,20 @@ function _from_json(json; repair = true)
|
||||
end
|
||||
|
||||
instance = UnitCommitmentInstance(
|
||||
T,
|
||||
power_balance_penalty,
|
||||
shortfall_penalty,
|
||||
units,
|
||||
buses,
|
||||
lines,
|
||||
reserves,
|
||||
contingencies,
|
||||
loads,
|
||||
buses_by_name = Dict(b.name => b for b in buses),
|
||||
buses = buses,
|
||||
contingencies_by_name = Dict(c.name => c for c in contingencies),
|
||||
contingencies = contingencies,
|
||||
lines_by_name = Dict(l.name => l for l in lines),
|
||||
lines = lines,
|
||||
power_balance_penalty = power_balance_penalty,
|
||||
price_sensitive_loads_by_name = Dict(ps.name => ps for ps in loads),
|
||||
price_sensitive_loads = loads,
|
||||
reserves = reserves,
|
||||
shortfall_penalty = shortfall_penalty,
|
||||
time = T,
|
||||
units_by_name = Dict(g.name => g for g in units),
|
||||
units = units,
|
||||
)
|
||||
if repair
|
||||
UnitCommitment.repair!(instance)
|
||||
|
||||
@@ -69,17 +69,21 @@ mutable struct PriceSensitiveLoad
|
||||
revenue::Vector{Float64}
|
||||
end
|
||||
|
||||
mutable struct UnitCommitmentInstance
|
||||
time::Int
|
||||
power_balance_penalty::Vector{Float64}
|
||||
"Penalty for failing to meet reserve requirement."
|
||||
shortfall_penalty::Vector{Float64}
|
||||
units::Vector{Unit}
|
||||
Base.@kwdef mutable struct UnitCommitmentInstance
|
||||
buses_by_name::Dict{AbstractString,Bus}
|
||||
buses::Vector{Bus}
|
||||
lines::Vector{TransmissionLine}
|
||||
reserves::Reserves
|
||||
contingencies_by_name::Dict{AbstractString,Contingency}
|
||||
contingencies::Vector{Contingency}
|
||||
lines_by_name::Dict{AbstractString,TransmissionLine}
|
||||
lines::Vector{TransmissionLine}
|
||||
power_balance_penalty::Vector{Float64}
|
||||
price_sensitive_loads_by_name::Dict{AbstractString,PriceSensitiveLoad}
|
||||
price_sensitive_loads::Vector{PriceSensitiveLoad}
|
||||
reserves::Reserves
|
||||
shortfall_penalty::Vector{Float64}
|
||||
time::Int
|
||||
units_by_name::Dict{AbstractString,Unit}
|
||||
units::Vector{Unit}
|
||||
end
|
||||
|
||||
function Base.show(io::IO, instance::UnitCommitmentInstance)
|
||||
|
||||
Reference in New Issue
Block a user