From aa2e4480065f3414bcf0bcf402a1a0afec406a4c Mon Sep 17 00:00:00 2001
From: Azzaare <jf@baffier.fr>
Date: Wed, 9 Aug 2023 04:54:04 +0000
Subject: [PATCH 1/2] Basic update for MOI/JuMP v1

---
 Project.toml        | 12 +++---
 src/CBLS.jl         |  3 +-
 src/MOI_wrapper.jl  |  8 ++--
 src/attributes.jl   | 10 ++---
 src/constraints.jl  | 75 ++++++++++++++++----------------------
 src/objectives.jl   |  2 +-
 src/results.jl      |  2 +-
 src/variables.jl    | 89 +++++++++++++++++++++------------------------
 test/JuMP.jl        |  7 ++--
 test/MOI_wrapper.jl |  2 +-
 10 files changed, 96 insertions(+), 114 deletions(-)

diff --git a/Project.toml b/Project.toml
index 29da198..afc4556 100644
--- a/Project.toml
+++ b/Project.toml
@@ -6,18 +6,20 @@ version = "0.1.12"
 [deps]
 ConstraintDomains = "5800fd60-8556-4464-8d61-84ebf7a0bedb"
 Constraints = "30f324ab-b02d-43f0-b619-e131c61659f7"
+Intervals = "d8418881-c3e1-53bb-8760-2df7ec849ed5"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 Lazy = "50d2b5c4-7a5e-59d5-8109-a42b560f39c0"
 LocalSearchSolvers = "2b10edaa-728d-4283-ac71-07e312d6ccf3"
 MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 
 [compat]
-ConstraintDomains = "0.2"
-Constraints = "0.2"
-JuMP = "0.21"
+ConstraintDomains = "0.3"
+Constraints = "0.5"
+Intervals = "1"
+JuMP = "1"
 Lazy = "0.15"
-LocalSearchSolvers = "0.3"
-MathOptInterface = "0.9"
+LocalSearchSolvers = "0.4"
+MathOptInterface = "1"
 julia = "1.6"
 
 [extras]
diff --git a/src/CBLS.jl b/src/CBLS.jl
index 3311c7d..4c0f00d 100644
--- a/src/CBLS.jl
+++ b/src/CBLS.jl
@@ -1,8 +1,8 @@
 module CBLS
 
-using Constraints: sequential_tasks
 using Constraints
 using ConstraintDomains
+using Intervals
 using JuMP
 using Lazy
 using LocalSearchSolvers
@@ -14,7 +14,6 @@ const MOI = MathOptInterface
 const MOIU = MOI.Utilities
 
 # MOI functions
-const SVF = MOI.SingleVariable
 const VOV = MOI.VectorOfVariables
 const OF = MOI.ObjectiveFunction
 
diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl
index 6fdc700..3b00126 100644
--- a/src/MOI_wrapper.jl
+++ b/src/MOI_wrapper.jl
@@ -85,9 +85,9 @@ MOI.is_empty(model::Optimizer) = LS._is_empty(model.solver)
 """
 Copy constructor for the optimizer
 """
-MOIU.supports_default_copy_to(::Optimizer, copy_names::Bool) = false
-function MOI.copy_to(model::Optimizer, src::MOI.ModelLike; kws...)
-    return MOIU.automatic_copy_to(model, src; kws...)
+MOI.supports_incremental_interface(::Optimizer) = true
+function MOI.copy_to(model::Optimizer, src::MOI.ModelLike)
+    return MOIU.default_copy_to(model, src)
 end
 
 """
@@ -119,6 +119,6 @@ DOCSTRING
 MOI.empty!(opt) = empty!(opt)
 
 
-function MOI.is_valid(optimizer::Optimizer, index::CI{SVF, MOI.Integer})
+function MOI.is_valid(optimizer::Optimizer, index::CI{VI, MOI.Integer})
     return index.value ∈ optimizer.int_vars
 end
diff --git a/src/attributes.jl b/src/attributes.jl
index cb59ee8..04396fd 100644
--- a/src/attributes.jl
+++ b/src/attributes.jl
@@ -1,6 +1,6 @@
 struct PrintLevel <: MOI.AbstractOptimizerAttribute end
 
-MOI.supports(::Optimizer, ::MOI.RawParameter) = true
+MOI.supports(::Optimizer, ::MOI.RawOptimizerAttribute) = true
 MOI.supports(::Optimizer, ::MOI.TimeLimitSec) = true
 MOI.supports(::Optimizer, ::MOI.NumberOfThreads) = true
 
@@ -17,11 +17,11 @@ function MOI.get(model::Optimizer, ::MOI.TimeLimitSec)
 end
 
 """
-    MOI.set(model::Optimizer, p::MOI.RawParameter, value)
-Set a RawParameter to `value`
+    MOI.set(model::Optimizer, p::MOI.RawOptimizerAttribute, value)
+Set a RawOptimizerAttribute to `value`
 """
-MOI.set(model::Optimizer, p::MOI.RawParameter, value) = set_option!(model, p.name, value)
-MOI.get(model::Optimizer, p::MOI.RawParameter) = get_option(model, p.name)
+MOI.set(model::Optimizer, p::MOI.RawOptimizerAttribute, value) = set_option!(model, p.name, value)
+MOI.get(model::Optimizer, p::MOI.RawOptimizerAttribute) = get_option(model, p.name)
 
 
 function MOI.set(model::Optimizer, ::MOI.NumberOfThreads, value)
diff --git a/src/constraints.jl b/src/constraints.jl
index 0bbecde..45716af 100644
--- a/src/constraints.jl
+++ b/src/constraints.jl
@@ -128,10 +128,9 @@ struct MOIAllDifferent <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIAllDifferent}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOIAllDifferent)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:all_different])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:all_different])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIAllDifferent}(cidx)
 end
@@ -159,10 +158,9 @@ struct MOIAllEqual <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIAllEqual}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOIAllEqual)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:all_equal])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:all_equal])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIAllEqual}(cidx)
 end
@@ -191,10 +189,9 @@ struct MOIEq <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIEq}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOIEq)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:eq])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:eq])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIEq}(cidx)
 end
@@ -223,10 +220,8 @@ struct MOIAlwaysTrue <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIAlwaysTrue}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOIAlwaysTrue)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:always_true])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(USUAL_CONSTRAINTS[:always_true])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIAlwaysTrue}(cidx)
 end
@@ -255,10 +250,9 @@ struct MOIOrdered <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIOrdered}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOIOrdered)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:ordered])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:ordered])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIOrdered}(cidx)
 end
@@ -288,10 +282,9 @@ struct MOIDistDifferent <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIDistDifferent}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOIDistDifferent)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:dist_different])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:dist_different])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIDistDifferent}(cidx)
 end
@@ -332,9 +325,9 @@ function MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIAllEqualPar
 end
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, set::MOIAllEqualParam{T}
 ) where T <: Number
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=set.param, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:all_equal_param])(x; param=param, dom_size=dom_size
+    # max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:all_equal_param])(x; param=param, dom_size=dom_size
     )
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIAllEqualParam{T}}(cidx)
@@ -379,10 +372,9 @@ function MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOISumEqualPar
 end
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, set::MOISumEqualParam{T}
 ) where {T <: Number}
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=set.param, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:sum_equal_param])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:sum_equal_param])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOISumEqualParam{T}}(cidx)
 end
@@ -427,10 +419,9 @@ function MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOILessThanPar
 end
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, set::MOILessThanParam{T}
 ) where {T <: Number}
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=set.param, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:less_than_param])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:less_than_param])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOILessThanParam{T}}(cidx)
 end
@@ -475,10 +466,9 @@ function MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOIMinusEqualP
 end
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, set::MOIMinusEqualParam{T}
 ) where {T <: Number}
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=set.param, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:minus_equal_param])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:minus_equal_param])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOIMinusEqualParam{T}}(cidx)
 end
@@ -511,10 +501,9 @@ struct MOISequentialTasks <: MOI.AbstractVectorSet
 end
 MOI.supports_constraint(::Optimizer, ::Type{VOV}, ::Type{MOISequentialTasks}) = true
 function MOI.add_constraint(optimizer::Optimizer, vars::MOI.VectorOfVariables, ::MOISequentialTasks)
-    max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
-    e = (x; param=nothing, dom_size=max_dom_size) -> error_f(
-        usual_constraints[:sequential_tasks])(x; param=param, dom_size=dom_size
-    )
+    #max_dom_size = max_domains_size(optimizer, map(x -> x.value, vars.variables))
+    e = (x; kargs...) -> error_f(
+        USUAL_CONSTRAINTS[:sequential_tasks])(x; kargs...)
     cidx = constraint!(optimizer, e, map(x -> x.value, vars.variables))
     return CI{VOV, MOISequentialTasks}(cidx)
 end
diff --git a/src/objectives.jl b/src/objectives.jl
index efcdcb6..5bb4cc3 100644
--- a/src/objectives.jl
+++ b/src/objectives.jl
@@ -45,7 +45,7 @@ ScalarFunction(f, x::VI) = ScalarFunction(f, VOV([x]))
 Base.copy(func::ScalarFunction) = ScalarFunction(func.f, func.X)
 
 # supports
-MOI.supports(::Optimizer, ::OF{ScalarFunction{F, V}}) where {F <: Function, V <: Union{Nothing, SVF,VOV}} = true
+MOI.supports(::Optimizer, ::OF{ScalarFunction{F, V}}) where {F <: Function, V <: Union{Nothing, VI,VOV}} = true
 
 # set
 function MOI.set(optimizer::Optimizer, ::OF, func::ScalarFunction{F, Nothing}
diff --git a/src/results.jl b/src/results.jl
index e743b92..71571c8 100644
--- a/src/results.jl
+++ b/src/results.jl
@@ -33,7 +33,7 @@ function MOI.get(optimizer::Optimizer, ::MOI.VariablePrimal, vi::MOI.VariableInd
 end
 
 
-MOI.get(optimizer::Optimizer, ::MOI.SolveTime) = time_info(optimizer)[:total_run]
+MOI.get(optimizer::Optimizer, ::MOI.SolveTimeSec) = time_info(optimizer)[:total_run]
 
 function MOI.get(optimizer::Optimizer, ::MOI.RawStatusString)
     return has_solution(optimizer) ? "Satisfying solution" : "No solutions"
diff --git a/src/variables.jl b/src/variables.jl
index 31807ba..6fa6298 100644
--- a/src/variables.jl
+++ b/src/variables.jl
@@ -5,34 +5,34 @@
 DOCSTRING
 """
 MOI.add_variable(model::Optimizer) = VI(variable!(model))
-MOI.add_variables(model::Optimizer, n::Int) = [MOI.add_variable(model) for i in 1:n]
+MOI.add_variables(model::Optimizer, n::Int) = [MOI.add_variable(model) for _ in 1:n]
 
-MOI.supports_constraint(::Optimizer, ::Type{SVF}) = true
+MOI.supports_constraint(::Optimizer, ::Type{VI}) = true
 
-function MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{MOI.EqualTo{T}}
+function MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{MOI.EqualTo{T}}
 ) where {T <: Real}
     return true
 end
 
-function MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{MOI.Interval{T}}
+function MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{MOI.Interval{T}}
 ) where {T <: Real}
     return true
 end
 
-function MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{MOI.LessThan{T}}
+function MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{MOI.LessThan{T}}
 ) where {T <: Real}
     return true
 end
 
-function MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{MOI.GreaterThan{T}}
+function MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{MOI.GreaterThan{T}}
 ) where {T <: Real}
     return true
 end
 
-MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{DiscreteSet{T}}) where {T <: Number} = true
+MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{DiscreteSet{T}}) where {T <: Number} = true
 
 """
-    MOI.add_constraint(optimizer::Optimizer, v::SVF, set::DiscreteSet{T}) where T <: Number
+    MOI.add_constraint(optimizer::Optimizer, v::VI, set::DiscreteSet{T}) where T <: Number
 
 DOCSTRING
 
@@ -41,95 +41,88 @@ DOCSTRING
 - `v`: DESCRIPTION
 - `set`: DESCRIPTION
 """
-function MOI.add_constraint(optimizer::Optimizer, v::SVF, set::DiscreteSet{T}
+function MOI.add_constraint(optimizer::Optimizer, v::VI, set::DiscreteSet{T}
 ) where {T <: Number}
-    vidx = MOI.index_value(v.variable)
+    vidx = v.value
     _set_domain!(optimizer, vidx, set.values)
-    return CI{SVF,DiscreteSet{T}}(vidx)
+    return CI{VI,DiscreteSet{T}}(vidx)
 end
 
-# function MOI.add_constraint(optimizer::Optimizer, v::SVF, lt::MOI.LessThan{T}
+# function MOI.add_constraint(optimizer::Optimizer, v::VI, lt::MOI.LessThan{T}
 # ) where {T <: AbstractFloat}
-#     vidx = MOI.index_value(v.variable)
+#     vidx = v.value
 #     d = make_domain(typemin(Int), lt.upper, Val(:range))
 #     update_domain!(optimizer, vidx, d)
-#     return CI{SVF,MOI.LessThan{T}}(vidx)
+#     return CI{VI,MOI.LessThan{T}}(vidx)
 # end
 
-# function MOI.add_constraint(optimizer::Optimizer, v::SVF, gt::MOI.GreaterThan{T}
+# function MOI.add_constraint(optimizer::Optimizer, v::VI, gt::MOI.GreaterThan{T}
 # ) where {T <: AbstractFloat}
-#     vidx = MOI.index_value(v.variable)
+#     vidx = v.value
 #     d = make_domain(gt.lower, typemax(Int), Val(:range))
 #     update_domain!(optimizer, vidx, d)
-#     return CI{SVF,MOI.GreaterThan{T}}(vidx)
+#     return CI{VI,MOI.GreaterThan{T}}(vidx)
 # end
 
 # make_domain(a, b, ::Val{:range}) = domain(Int(a):Int(b))
 # make_domain(a, b, ::Val{:inter}) = domain((a, true), (b, true))
 
-function MOI.add_constraint(optimizer::Optimizer, v::SVF, lt::MOI.LessThan{T}
+function MOI.add_constraint(optimizer::Optimizer, v::VI, lt::MOI.LessThan{T}
     ) where {T <: AbstractFloat}
-        vidx = MOI.index_value(v.variable)
+        vidx = v.value
         push!(optimizer.compare_vars, vidx)
         if vidx ∈ optimizer.int_vars
-            d = make_domain(typemin(Int), lt.upper, Val(:range))
+            d = domain(Int(typemin(Int)), Int(lt.upper))
         else
-            a = (Float64(floatmin(Float32)), false)
-            b = (lt.upper, true)
-            d = make_domain(a, b, Val(:inter))
+            a = Float64(-floatmax(Float32))
+            d = domain(Interval{Open, Closed}(a, lt.upper))
         end
         update_domain!(optimizer, vidx, d)
-        return CI{SVF,MOI.LessThan{T}}(vidx)
+        return CI{VI,MOI.LessThan{T}}(vidx)
     end
 
-    function MOI.add_constraint(optimizer::Optimizer, v::SVF, gt::MOI.GreaterThan{T}
+    function MOI.add_constraint(optimizer::Optimizer, v::VI, gt::MOI.GreaterThan{T}
     ) where {T <: AbstractFloat}
-        vidx = MOI.index_value(v.variable)
+        vidx = v.value
         push!(optimizer.compare_vars, vidx)
         if vidx ∈ optimizer.int_vars
-            d = make_domain(gt.lower, typemax(Int), Val(:range))
+            d = domain(Int(gt.lower):Int(typemax(Int)))
         else
-            a = (gt.lower, true)
-            b = (Float64(floatmax(Float32)), false)
-            d = make_domain(a, b, Val(:inter))
+            b = Float64(floatmax(Float32))
+            d = domain(Interval{Closed, Open}(gt.lower, b))
         end
         update_domain!(optimizer, vidx, d)
-        return CI{SVF,MOI.GreaterThan{T}}(vidx)
+        return CI{VI,MOI.GreaterThan{T}}(vidx)
     end
 
-    make_domain(a, b, ::Val{:range}) = domain(Int(a):Int(b))
-    make_domain(a::Real, b::Real, ::Val{:inter}) = domain((a, true), (b, true))
-    make_domain(a::Tuple, b::Tuple, ::Val{:inter}) = domain(a, b)
-
-
-function MOI.add_constraint(optimizer::Optimizer, v::SVF, i::MOI.Interval{T}
+function MOI.add_constraint(optimizer::Optimizer, v::VI, i::MOI.Interval{T}
 ) where {T <: Real}
-    vidx = MOI.index_value(v.variable)
-    is_int = MOI.is_valid(optimizer, CI{SVF, MOI.Integer}(vidx))
+    vidx = v.value
+    is_int = MOI.is_valid(optimizer, CI{VI, MOI.Integer}(vidx))
     d = make_domain(i.lower, i.upper, Val(is_int ? :range : :inter))
     _set_domain!(optimizer, vidx, d)
-    return CI{SVF,MOI.Interval{T}}(vidx)
+    return CI{VI,MOI.Interval{T}}(vidx)
 end
 
-function MOI.add_constraint(optimizer::Optimizer, v::SVF, et::MOI.EqualTo{T}
+function MOI.add_constraint(optimizer::Optimizer, v::VI, et::MOI.EqualTo{T}
 ) where {T <: Number}
-    vidx = MOI.index_value(v.variable)
+    vidx = v.value
     _set_domain!(optimizer, vidx, et.value)
-    return CI{SVF,MOI.EqualTo{T}}(vidx)
+    return CI{VI,MOI.EqualTo{T}}(vidx)
 end
 
 """
 Binary/Integer variable support
 """
-# MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{<:VAR_TYPES}) = true
-MOI.supports_constraint(::Optimizer, ::Type{SVF}, ::Type{<:MOI.Integer}) = true
+# MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{<:VAR_TYPES}) = true
+MOI.supports_constraint(::Optimizer, ::Type{VI}, ::Type{<:MOI.Integer}) = true
 
-function MOI.add_constraint(optimizer::Optimizer, v::SVF, ::MOI.Integer)
-    vidx = MOI.index_value(v.variable)
+function MOI.add_constraint(optimizer::Optimizer, v::VI, ::MOI.Integer)
+    vidx = v.value
     push!(optimizer.int_vars, vidx)
     if vidx ∈ optimizer.compare_vars
         x = get_variable(optimizer, vidx)
         _set_domain!(optimizer, vidx, convert(RangeDomain, x.domain))
     end
-    return MOI.ConstraintIndex{SVF,MOI.Integer}(vidx)
+    return MOI.ConstraintIndex{VI,MOI.Integer}(vidx)
 end
diff --git a/test/JuMP.jl b/test/JuMP.jl
index aa17886..8a16965 100644
--- a/test/JuMP.jl
+++ b/test/JuMP.jl
@@ -13,12 +13,11 @@ using JuMP
 
     @constraint(m, X in AllDifferent())
     @constraint(m, X in AllEqual())
-    @constraint(m, X in AllEqualParam(2))
-    @constraint(m, X in AlwaysTrue())
+    #@constraint(m, X in AllEqualParam(2))
     @constraint(m, X[1:4] in DistDifferent())
-    @constraint(m, X[1:2] in Eq())
+    #@constraint(m, X[1:4] in SequentialTasks())
     @constraint(m, X in Ordered())
-    @constraint(m, X in SumEqualParam(22))
+    #@constraint(m, X in SumEqualParam(22))
 
     optimize!(m)
 end
diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl
index e1fe992..0106487 100644
--- a/test/MOI_wrapper.jl
+++ b/test/MOI_wrapper.jl
@@ -25,7 +25,7 @@ end
 const BRIDGED = MOI.instantiate(
     OPTIMIZER_CONSTRUCTOR, with_bridge_type = Float64
 )
-const CONFIG = MOIT.TestConfig(atol=1e-6, rtol=1e-6)
+const CONFIG = MOIT.Config(atol=1e-6, rtol=1e-6)
 
 # @testset "Unit" begin
 #     # Test all the functions included in dictionary `MOI.Test.unittests`,

From 6c1e378b4868cbcdc0a85f538eb66ae9870a4fa1 Mon Sep 17 00:00:00 2001
From: Azzaare <jf@baffier.fr>
Date: Sun, 8 Oct 2023 10:08:41 +0000
Subject: [PATCH 2/2] New version. Update CI.

---
 .github/workflows/CI.yml | 5 ++---
 Project.toml             | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 8446919..67f3220 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -1,6 +1,5 @@
 name: CI
 on:
-  - push
   - pull_request
 jobs:
   test:
@@ -10,7 +9,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - "^1.6.0-0"
+          - "1.9"
           - 'nightly'
         os:
           - ubuntu-latest
@@ -57,7 +56,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: julia-actions/setup-julia@v1
         with:
-          version: "^1.6.0-0"
+          version: "1"
       - run: |
           julia --project=docs -e '
             using Pkg
diff --git a/Project.toml b/Project.toml
index afc4556..a8e340b 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "CBLS"
 uuid = "a3809bfe-37bb-4d48-a667-bac4c6be8d90"
 authors = ["Jean-Francois Baffier"]
-version = "0.1.12"
+version = "0.1.13"
 
 [deps]
 ConstraintDomains = "5800fd60-8556-4464-8d61-84ebf7a0bedb"