Skip to content

Unique names with no underscore (replace #161) #184

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
merged 1 commit into from
Apr 29, 2025
Merged

Unique names with no underscore (replace #161) #184

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
4 changes: 3 additions & 1 deletion src/dual_model_variables.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function _add_dual_variable(
# Add each vi to the dictionary
func = MOI.get(primal_model, MOI.ConstraintFunction(), ci)
set = MOI.get(primal_model, MOI.ConstraintSet(), ci)
is_unique_var = length(vis) == 1
for (i, vi) in enumerate(vis)
if !(F <: MOI.VectorOfVariables)
value = set_dot(i, set, T) * _get_normalized_constant(func, set, i)
Expand All @@ -89,7 +90,8 @@ function _add_dual_variable(
end
if !is_empty(dual_names) && !isempty(ci_name)
pre = dual_names.dual_variable_name_prefix
MOI.set(dual_model, MOI.VariableName(), vi, pre * ci_name * "_$i")
pos = is_unique_var ? "" : "_$i"
MOI.set(dual_model, MOI.VariableName(), vi, pre * ci_name * pos)
end
end
return
Expand Down
2 changes: 1 addition & 1 deletion test/Tests/test_JuMP_dualize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ end

dual_model = dualize(model; dual_names = DualNames("dual", ""))

@test typeof(dual_model[:dualeqcon_1]) == VariableRef
@test typeof(dual_model[:dualeqcon]) == VariableRef
@test !haskey(dual_model, Symbol(""))
end
@testset "JuMP_dualize_kwargs" begin
Expand Down
2 changes: 1 addition & 1 deletion test/Tests/test_dual_names.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
}(
1,
)].dual_variables[1]
@test MOI.get(dual_model, MOI.VariableName(), vi_2) == "dualvar_lessthan_1"
@test MOI.get(dual_model, MOI.VariableName(), vi_2) == "dualvar_lessthan"
# Query constraint names
ci_1 =
primal_dual_map.primal_variable_data[MOI.VariableIndex(
Expand Down
Loading