Skip to content
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

Use add_constrained_variable with two sets when adding bounded variables #3865

Merged
merged 4 commits into from
Nov 7, 2024
Merged

Use add_constrained_variable with two sets when adding bounded variables #3865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4d4ac8
Use add_constrained_variable with two sets when adding bounded variables
odow Nov 3, 2024
74d86b4
Update src/variables.jl
odow Nov 6, 2024
1bd54e4
Update src/variables.jl
odow Nov 6, 2024
e9a6ffc
Update Project.toml
odow Nov 6, 2024
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ JuMPDimensionalDataExt = "DimensionalData"
DimensionalData = "0.24, 0.25, 0.26.2, 0.27, 0.28"
LinearAlgebra = "<0.0.1, 1.6"
MacroTools = "0.5"
MathOptInterface = "1.25.2"
MathOptInterface = "1.34.0"
MutableArithmetics = "1.1"
OrderedCollections = "1"
Printf = "<0.0.1, 1.6"
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ JSON = "0.21"
JSONSchema = "1"
Literate = "2.8"
MarkdownAST = "0.1"
MathOptInterface = "=1.32.0"
MathOptInterface = "=1.34.0"
MultiObjectiveAlgorithms = "=1.3.3"
PATHSolver = "=1.7.8"
ParametricOptInterface = "0.8.1"
Expand Down
20 changes: 17 additions & 3 deletions src/variables.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,15 @@
return x
end

function _moi_add_constrained_variable(

Check warning on line 1984 in src/variables.jl

View check run for this annotation

Codecov / codecov/patch

src/variables.jl#L1984 

Added line #L1984 was not covered by tests
moi_backend::MOI.ModelLike,
::Nothing,
set::Tuple{MOI.GreaterThan{T},MOI.LessThan{T}},
) where {T<:Real}
x, _ = MOI.add_constrained_variable(moi_backend, set)
return x
end

function _moi_add_variable(
moi_backend,
model::GenericModel{T},
Expand All @@ -1992,12 +2001,17 @@
# variables.
index = nothing
info = v.info
if info.has_lb
if info.has_lb && info.has_ub
set = (
MOI.GreaterThan{T}(_to_value(T, info.lower_bound, "lower bound")),
MOI.LessThan{T}(_to_value(T, info.upper_bound, "upper bound")),
)
index = _moi_add_constrained_variable(moi_backend, index, set)
elseif info.has_lb
set_lb =
MOI.GreaterThan{T}(_to_value(T, info.lower_bound, "lower bound"))
index = _moi_add_constrained_variable(moi_backend, index, set_lb)
end
if info.has_ub
elseif info.has_ub
set_ub = MOI.LessThan{T}(_to_value(T, info.upper_bound, "upper bound"))
index = _moi_add_constrained_variable(moi_backend, index, set_ub)
end
Expand Down
Loading