Skip to content

pass type not instance to is_time_variant_term #78

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

Merged
jd-lara merged 2 commits into from
Apr 16, 2026
+6 −6
Merged

pass type not instance to is_time_variant_term #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
349728a
pass type not instance to `is_time_variant_term`
luke-kiernan Apr 14, 2026
e578cbe
update POM `is_time_variant_term` call to pass type not instance
luke-kiernan Apr 15, 2026
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/static_injector_models/electric_loads.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ is_time_variant_term(
::OptimizationContainer,
::PSY.LoadCost,
::OnVariable,
::PSY.ControllableLoad,
::Type{<:PSY.ControllableLoad},
::AbstractLoadFormulation,
::Int,
) = false
Expand All @@ -245,7 +245,7 @@ is_time_variant_term(
::OptimizationContainer,
cost::PSY.MarketBidCost,
::OnVariable,
::PSY.ControllableLoad,
::Type{<:PSY.ControllableLoad},
::PowerLoadInterruption,
::Int,
) =
Expand Down
4 changes: 2 additions & 2 deletions src/static_injector_models/hydro_generation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2291,7 +2291,7 @@ function add_proportional_cost!(
for t in get_time_steps(container)
cost_term = proportional_cost(container, op_cost_data, U(), d, V(), t)
add_as_time_variant =
is_time_variant_term(container, op_cost_data, U(), d, V(), t)
is_time_variant_term(container, op_cost_data, U(), T, V(), t)
iszero(cost_term) && continue
cost_term *= multiplier
exp = if d isa PSY.HydroPumpTurbine && PSY.get_must_run(d)
Expand Down Expand Up @@ -2323,7 +2323,7 @@ is_time_variant_term(
::OptimizationContainer,
cost::PSY.MarketBidCost,
::OnVariable,
::PSY.HydroGen,
::Type{<:PSY.HydroGen},
::AbstractHydroUnitCommitment,
t::Int,
) =
Expand Down
4 changes: 2 additions & 2 deletions src/static_injector_models/thermal_generation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ initial_condition_variable(::InitialTimeDurationOff, d::PSY.ThermalGen, ::Abstra
function proportional_cost(container::OptimizationContainer, cost::PSY.ThermalGenerationCost, S::OnVariable, T::PSY.ThermalGen, U::AbstractThermalFormulation, t::Int)
return onvar_cost(container, cost, S, T, U, t) + PSY.get_constant_term(PSY.get_vom_cost(PSY.get_variable(cost))) + PSY.get_fixed(cost)
end
is_time_variant_term(::OptimizationContainer, ::PSY.ThermalGenerationCost, ::OnVariable, ::PSY.ThermalGen, ::AbstractThermalFormulation, t::Int) = false
is_time_variant_term(::OptimizationContainer, ::PSY.ThermalGenerationCost, ::OnVariable, ::Type{<:PSY.ThermalGen}, ::AbstractThermalFormulation, t::Int) = false

function proportional_cost(container::OptimizationContainer, cost::PSY.MarketBidCost, ::OnVariable, comp::T, ::AbstractThermalFormulation, t::Int) where {T <: PSY.ThermalGen}
if is_time_variant(PSY.get_incremental_initial_input(cost))
Expand All @@ -108,7 +108,7 @@ function proportional_cost(container::OptimizationContainer, cost::PSY.MarketBid
return PSY.get_initial_input(PSY.get_incremental_offer_curves(PSY.get_operation_cost(comp)))
end
end
is_time_variant_term(::OptimizationContainer, cost::PSY.MarketBidCost, ::OnVariable, ::PSY.ThermalGen, ::AbstractThermalFormulation, t::Int) =
is_time_variant_term(::OptimizationContainer, cost::PSY.MarketBidCost, ::OnVariable, ::Type{<:PSY.ThermalGen}, ::AbstractThermalFormulation, t::Int) =
is_time_variant(PSY.get_incremental_initial_input(cost))

proportional_cost(::Union{PSY.MarketBidCost, PSY.ThermalGenerationCost}, ::Union{RateofChangeConstraintSlackUp, RateofChangeConstraintSlackDown}, ::PSY.ThermalGen, ::AbstractThermalFormulation) = CONSTRAINT_VIOLATION_SLACK_COST
Expand Down
Loading