add delete! and use proper get and set methods

atoptima · Aug 13, 2021 · da2a964 · da2a964
1 parent 0182167
commit da2a964
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/src/MOIwrapper.jl b/src/MOIwrapper.jl
@@ -224,9 +224,7 @@ function MOI.delete(model::Coluna.Optimizer, vi::MOI.VariableIndex)
         MOI.modify(model, ci, MOI.ScalarCoefficientChange(vi, 0.0))
     end
     varid = getid(model.vars[vi])
-    orig_form = model.inner.original_formulation
-    delete!(orig_form.manager.vars, varid)
-    delete!(orig_form.buffer.var_buffer.added, varid)
+    delete!(get_original_formulation(model.inner), varid)
     delete!(model.moi_varids, varid)
     delete!(model.vars, vi)
     delete!(model.env.varids, vi)
@@ -237,9 +235,9 @@ function MOI.modify(
     model::Coluna.Optimizer, ::MOI.ObjectiveFunction{MOI.ScalarAffineFunction{Float64}},
     change::MathOptInterface.ScalarCoefficientChange{Float64}
 )
-    var = model.vars[change.variable]
-    var.perendata.cost = change.new_coefficient
-    var.curdata.cost = change.new_coefficient
+    setperencost!(
+        get_original_formulation(model.inner), model.vars[change.variable], change.new_coefficient
+    )
     return
 end
 
@@ -257,7 +255,7 @@ function MOI.delete(
     model::Coluna.Optimizer, ci::MOI.ConstraintIndex{F,S}
 ) where {F<:MOI.ScalarAffineFunction{Float64},S}
     constrid = getid(model.constrs[ci])
-    orig_form = model.inner.original_formulation
+    orig_form = get_original_formulation(model.inner)
     coefmatrix = getcoefmatrix(orig_form)
     varids = VarId[]
     for (varid, _) in @view coefmatrix[constrid, :]
@@ -266,8 +264,7 @@ function MOI.delete(
     for varid in varids
         coefmatrix[constrid, varid] = 0.0
     end
-    delete!(orig_form.buffer.constr_buffer.added, constrid)
-    delete!(orig_form.manager.constrs, constrid)
+    delete!(orig_form, constrid)
     delete!(model.constrs, ci)
     return
 end
@@ -276,9 +273,7 @@ function MOI.modify(
     model::Coluna.Optimizer, ci::MOI.ConstraintIndex{F,S},
     change::MOI.ScalarConstantChange{Float64}
 ) where {F<:MOI.ScalarAffineFunction{Float64},S}
-    constr = model.constrs[ci]
-    constr.perendata.rhs = change.new_constant
-    constr.curdata.rhs = change.new_constant
+    setperenrhs!(get_original_formulation(model.inner), model.constrs[ci], change.new_constant)
     return
 end
 
@@ -288,7 +283,7 @@ function MOI.modify(
 ) where {F<:MOI.ScalarAffineFunction{Float64},S}
     varid = getid(model.vars[change.variable])
     constrid = getid(model.constrs[ci])
-    getcoefmatrix(model.inner.original_formulation)[constrid, varid] = change.new_coefficient
+    getcoefmatrix(get_original_formulation(model.inner))[constrid, varid] = change.new_coefficient
     return
 end
 

diff --git a/src/MathProg/MathProg.jl b/src/MathProg/MathProg.jl
@@ -8,7 +8,7 @@ import TimerOutputs
 import ..Coluna # for NestedEnum (types.jl:210)
 using ..ColunaBase
 
-import Base: haskey, length, iterate, diff
+import Base: haskey, length, iterate, diff, delete!
 
 using DynamicSparseArrays, Logging, Printf
 

diff --git a/src/MathProg/varconstr.jl b/src/MathProg/varconstr.jl
@@ -453,6 +453,26 @@ function deactivate!(form::Formulation, f::Function)
     return
 end
 
+## delete
+"""
+    delete!(formulation, varconstrid)
+    delete!(formulation, varconstr)
+
+Delete a variable or a constraint from a formulation.
+"""
+function Base.delete!(form::Formulation, varid::VarId)
+    delete!(form.manager.vars, varid)
+    delete!(form.buffer.var_buffer.added, varid)
+    return
+end
+Base.delete!(form::Formulation, var::Variable) = delete!(form, getid(var))
+
+function Base.delete!(form::Formulation, constrid::ConstrId)
+    delete!(form.buffer.constr_buffer.added, constrid)
+    delete!(form.manager.constrs, constrid)
+end
+Base.delete!(form::Formulation, constr::Constraint) = delete!(form, getid(constr))
+
 ## explicit
 """
     isexplicit(formulation, varconstr)