Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/services_models/agc.jl
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function objective_function!(
agcs::IS.FlattenIteratorWrapper{T},
::ServiceModel{<:PSY.AGC, U},
) where {T <: PSY.AGC, U <: PIDSmoothACE}
add_proportional_cost!(container, LiftVariable(), agcs, U())
add_service_proportional_cost!(container, LiftVariable(), agcs, U())
return
end

Expand Down Expand Up @@ -295,7 +295,7 @@ function add_feedforward_constraints!(
return
end

function add_proportional_cost!(
function add_service_proportional_cost!(
container::OptimizationContainer,
::U,
agcs::IS.FlattenIteratorWrapper{T},
Expand Down
8 changes: 4 additions & 4 deletions src/services_models/reserves.jl
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ function objective_function!(
service::SR,
::ServiceModel{SR, T},
) where {SR <: PSY.AbstractReserve, T <: AbstractReservesFormulation}
add_proportional_cost!(container, ActivePowerReserveVariable(), service, T())
add_reserves_proportional_cost!(container, ActivePowerReserveVariable(), service, T())
return
end

Expand Down Expand Up @@ -517,11 +517,11 @@ function add_variable_cost!(
service::T,
::V,
) where {T <: PSY.ReserveDemandCurve, U <: VariableType, V <: StepwiseCostReserve}
_add_variable_cost_to_objective!(container, U(), service, V())
_add_reserves_variable_cost_to_objective!(container, U(), service, V())
return
end

function _add_variable_cost_to_objective!(
function _add_reserves_variable_cost_to_objective!(
container::OptimizationContainer,
::T,
component::PSY.Reserve,
Expand Down Expand Up @@ -555,7 +555,7 @@ function _add_variable_cost_to_objective!(
return
end

function add_proportional_cost!(
function add_reserves_proportional_cost!(
container::OptimizationContainer,
::U,
service::T,
Expand Down
Loading