From 068fd001ae00dcf31c3bfd05e150ce2b6ca4c6ab Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Tue, 7 Jul 2026 12:52:00 +1200 Subject: [PATCH] [Utilities] simplify PenaltyRelaxation methods to remove ambiguities JuMP is failing nightly tests because of this. --- src/Utilities/penalty_relaxation.jl | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/Utilities/penalty_relaxation.jl b/src/Utilities/penalty_relaxation.jl index 4de8868f7e..e0529fe8e9 100644 --- a/src/Utilities/penalty_relaxation.jl +++ b/src/Utilities/penalty_relaxation.jl @@ -365,25 +365,14 @@ mutable struct PenaltyRelaxation{T} warn::Bool function PenaltyRelaxation( - p::Dict{MOI.ConstraintIndex,T}; + p::Dict{<:MOI.ConstraintIndex,T} = Dict{MOI.ConstraintIndex,Float64}(); default::Union{Nothing,T} = one(T), warn::Bool = true, ) where {T} - return new{T}(default, p, warn) + return new{T}(default, convert(Dict{MOI.ConstraintIndex,T}, p), warn) end end -function PenaltyRelaxation(; kwargs...) - return PenaltyRelaxation(Dict{MOI.ConstraintIndex,Float64}(); kwargs...) -end - -function PenaltyRelaxation( - d::Dict{<:MOI.ConstraintIndex,T}; - kwargs..., -) where {T} - return PenaltyRelaxation(convert(Dict{MOI.ConstraintIndex,T}, d); kwargs...) -end - function MOI.modify(model::MOI.ModelLike, relax::PenaltyRelaxation{T}) where {T} map = Dict{MOI.ConstraintIndex,MOI.ScalarAffineFunction{T}}() penalty_expr = zero(MOI.ScalarAffineFunction{T})