Skip to content

Rename .variable_bounds to .variables #1523

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 3 commits into from
Aug 11, 2021
Merged

Rename .variable_bounds to .variables #1523

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a3e6e
Rename .variable_bounds to .variables
odow Aug 11, 2021
60703fd
Merge branch 'master' into od/variable_bounds
odow Aug 11, 2021
3082021
Update model.jl
odow Aug 11, 2021
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
32 changes: 16 additions & 16 deletions src/Utilities/model.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const AbstractModel{T} = Union{AbstractModelLike{T},AbstractOptimizer{T}}

# Variables
function MOI.get(model::AbstractModel, attr::MOI.NumberOfVariables)::Int64
return MOI.get(model.variable_bounds, attr)
return MOI.get(model.variables, attr)
end

"""
Expand All @@ -23,7 +23,7 @@ function _add_variable(::Nothing) end
function _add_variables(::Nothing, ::Int64) end

function MOI.add_variable(model::AbstractModel)
x = MOI.add_variable(model.variable_bounds)
x = MOI.add_variable(model.variables)
_add_variable(model.constraints)
return x
end
Expand Down Expand Up @@ -73,7 +73,7 @@ function _delete_variable(
model::AbstractModel{T},
vi::MOI.VariableIndex,
) where {T}
MOI.delete(model.variable_bounds, vi)
MOI.delete(model.variables, vi)
delete!(model.var_to_name, vi)
model.name_to_var = nothing
model.name_to_con = nothing
Expand Down Expand Up @@ -111,19 +111,19 @@ function MOI.is_valid(
model::AbstractModel,
ci::CI{MOI.SingleVariable,S},
) where {S}
return MOI.is_valid(model.variable_bounds, ci)
return MOI.is_valid(model.variables, ci)
end

function MOI.is_valid(model::AbstractModel, ci::MOI.ConstraintIndex)
return MOI.is_valid(model.constraints, ci)
end

function MOI.is_valid(model::AbstractModel, x::MOI.VariableIndex)
return MOI.is_valid(model.variable_bounds, x)
return MOI.is_valid(model.variables, x)
end

function MOI.get(model::AbstractModel, attr::MOI.ListOfVariableIndices)
return MOI.get(model.variable_bounds, attr)
return MOI.get(model.variables, attr)
end

# Names
Expand Down Expand Up @@ -356,7 +356,7 @@ function MOI.add_constraint(
f::MOI.SingleVariable,
s::SUPPORTED_VARIABLE_SCALAR_SETS{T},
) where {T}
return MOI.add_constraint(model.variable_bounds, f, s)
return MOI.add_constraint(model.variables, f, s)
end

function MOI.add_constraint(
Expand All @@ -380,7 +380,7 @@ function _delete_constraint(
ci::MOI.ConstraintIndex{MOI.SingleVariable,S},
) where {S}
MOI.throw_if_not_valid(model, ci)
MOI.delete(model.variable_bounds, ci)
MOI.delete(model.variables, ci)
return
end

Expand Down Expand Up @@ -420,7 +420,7 @@ function MOI.set(
set::S,
) where {T,S<:SUPPORTED_VARIABLE_SCALAR_SETS{T}}
MOI.throw_if_not_valid(model, ci)
MOI.set(model.variable_bounds, attr, ci, set)
MOI.set(model.variables, attr, ci, set)
return
end

Expand Down Expand Up @@ -448,7 +448,7 @@ function MOI.get(
model::AbstractModel,
attr::MOI.NumberOfConstraints{MOI.SingleVariable,S},
) where {S}
return MOI.get(model.variable_bounds, attr)
return MOI.get(model.variables, attr)
end

function MOI.get(
Expand All @@ -464,15 +464,15 @@ function MOI.get(
) where {T}
return vcat(
MOI.get(model.constraints, attr)::Vector{Tuple{Type,Type}},
MOI.get(model.variable_bounds, attr)::Vector{Tuple{Type,Type}},
MOI.get(model.variables, attr)::Vector{Tuple{Type,Type}},
)
end

function MOI.get(
model::AbstractModel,
attr::MOI.ListOfConstraintIndices{MOI.SingleVariable,S},
) where {S}
return MOI.get(model.variable_bounds, attr)
return MOI.get(model.variables, attr)
end

function MOI.get(
Expand Down Expand Up @@ -504,20 +504,20 @@ function MOI.get(
ci::CI{MOI.SingleVariable,S},
) where {S}
MOI.throw_if_not_valid(model, ci)
return set_from_constants(model.variable_bounds, S, ci.value)
return set_from_constants(model.variables, S, ci.value)
end

function MOI.is_empty(model::AbstractModel)
return isempty(model.name) &&
MOI.is_empty(model.objective) &&
MOI.is_empty(model.constraints) &&
MOI.is_empty(model.variable_bounds)
MOI.is_empty(model.variables)
end

function MOI.empty!(model::AbstractModel{T}) where {T}
model.name = ""
MOI.empty!(model.objective)
MOI.empty!(model.variable_bounds)
MOI.empty!(model.variables)
empty!(model.var_to_name)
model.name_to_var = nothing
empty!(model.con_to_name)
Expand Down Expand Up @@ -770,7 +770,7 @@ for (loop_name, loop_super_type) in [
mutable struct $name{T,C} <: $super_type{T}
name::String
objective::ObjectiveFunctionContainer{T}
variable_bounds::SingleVariableConstraints{T}
variables::SingleVariableConstraints{T}
constraints::C
var_to_name::Dict{MOI.VariableIndex,String}
# If `nothing`, the dictionary hasn't been constructed yet.
Expand Down