Update to MOI v1 (#2)

* Update to MOI v1

* Update JavaCall to 0.8. Doesn't fix the test errors

* Bump

* Fix

* Fixes

* set environment variables

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Fix

* Don't set copy_stack on windows

---------

Co-authored-by: Azzaare <jf@baffier.fr>

Author: blegat

.github/workflows/GitHubCI.yml

@@ -15,6 +15,9 @@ jobs:
   test:
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
+    env:
+      JULIA_NUM_THREADS: '1'
+      JULIA_COPY_STACKS: ${{ matrix.os == 'windows-latest' && '0' || '1' }}
     strategy:
       fail-fast: false
       matrix:
@@ -45,16 +48,7 @@ jobs:
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v4
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1

Project.toml

@@ -1,7 +1,7 @@
 name = "JaCoP"
 uuid = "02462d8f-a5b3-44fd-8fd4-3169fe7a24c5"
 authors = ["Thibaut Cuvelier <cuvelier.thibaut@gmail.com>"]
-repo = "https://github.com/dourouc05/JaCoP.jl"
+repo = "https://github.com/JuliaConstraints/JaCoP.jl"
 version = "0.1.0"
 
 [deps]
@@ -12,7 +12,7 @@ Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
-julia = "^1.6"
-MathOptInterface = "^0.10"
-ConstraintProgrammingExtensions = "^0.6.2, ^0.7"
-JavaCall = "^0.7.4"
+julia = "1.10"
+MathOptInterface = "1"
+ConstraintProgrammingExtensions = "0.8"
+JavaCall = "0.8"

src/MOI/parse.jl

@@ -2,7 +2,7 @@ function _parse_to_vars(
     model::Optimizer,
     f::MOI.VectorOfVariables,
 )
-    return [_info(model, v) for v in f.variables]
+    return [_info(model, v).variable for v in f.variables]
 end
 
 function _parse_to_coeffs_vars(
@@ -19,6 +19,6 @@ function _parse_to_coeffs_vars(
     terms::Vector{MOI.ScalarAffineTerm{T}},
 ) where {T <: Integer}
     coeffs = Int32[t.coefficient for t in terms]
-    vars = Variable[_info(model, t.variable) for t in terms]
+    vars = Variable[_info(model, t.variable).variable for t in terms]
     return coeffs, vars
 end

src/MOI/wrapper.jl

@@ -36,15 +36,15 @@ end
 mutable struct ConstraintInfo
     # Only necessary information to access an existing constraint, delete it when needed.
     index::MOI.ConstraintIndex
-    constraint::Union{Constraint, Nothing}
+    constraint::Union{JavaObject, Nothing}
     f::Union{MOI.AbstractScalarFunction, MOI.AbstractVectorFunction}
     set::MOI.AbstractSet
     name::String
 end
 
 function ConstraintInfo(
     index::MOI.ConstraintIndex,
-    constraint::Union{Constraint, Nothing},
+    constraint::Union{JavaObject, Nothing},
     f::Union{MOI.AbstractScalarFunction, MOI.AbstractVectorFunction},
     set::MOI.AbstractSet,
 )
@@ -73,8 +73,9 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
     # objective_function_cp::Union{Nothing, NumExpr}
     # objective_cp::Union{Nothing, IloObjective}
 
-    # # Cache parts of a solution.
-    # cached_solution_state::Union{Nothing, Bool}
+    # Cached solution state.
+    termination_status::MOI.TerminationStatusCode
+    primal_status::MOI.ResultStatusCode
 
     # # Mappings from variable and constraint names to their indices. These are
     # # lazily built on-demand, so most of the time, they are `nothing`.
@@ -97,12 +98,14 @@ mutable struct Optimizer <: MOI.AbstractOptimizer
             CleverDicts.CleverDict{MOI.VariableIndex, VariableInfo}()
         model.constraint_info = Dict{MOI.ConstraintIndex, ConstraintInfo}()
 
+        model.termination_status = MOI.OPTIMIZE_NOT_CALLED
+        model.primal_status = MOI.NO_SOLUTION
+
         # model.objective_sense = MOI.FEASIBILITY_SENSE
         # model.objective_function = nothing
         # model.objective_function_cp = nothing
         # model.objective_cp = nothing
 
-        # model.cached_solution_state = nothing
         # model.callback_state = CB_NONE
 
         MOI.empty!(model)
@@ -117,29 +120,16 @@ function MOI.empty!(model::Optimizer)
     model.name = ""
     empty!(model.variable_info)
     empty!(model.constraint_info)
-
-    # model.objective_sense = MOI.FEASIBILITY_SENSE
-    # model.objective_function = nothing
-    # model.objective_function_cp = nothing
-    # model.objective_cp = nothing
-
-    # model.cached_solution_state = nothing
-    # model.name_to_variable = nothing
-    # model.name_to_constraint = nothing
+    model.termination_status = MOI.OPTIMIZE_NOT_CALLED
+    model.primal_status = MOI.NO_SOLUTION
     return
 end
 
 function MOI.is_empty(model::Optimizer)
     !isempty(model.name) && return false
     !isempty(model.variable_info) && return false
     !isempty(model.constraint_info) && return false
-    # model.objective_sense != MOI.FEASIBILITY_SENSE && return false
-    # model.objective_function !== nothing && return false
-    # model.objective_function_cp !== nothing && return false
-    # model.objective_cp !== nothing && return false
-    # model.name_to_variable !== nothing && return false
-    # model.name_to_constraint !== nothing && return false
-    # model.cached_solution_state !== nothing && return false
+    model.termination_status != MOI.OPTIMIZE_NOT_CALLED && return false
     return true
 end
 
@@ -226,3 +216,50 @@ end
 function MOI.get(::Optimizer, ::MOI.ListOfConstraintAttributesSet)
     return MOI.AbstractConstraintAttribute[MOI.ConstraintName()]
 end
+
+function MOI.optimize!(model::Optimizer)
+    int_vars = IntVar[
+        info.variable for info in values(model.variable_info)
+        if info.variable isa IntVar
+    ]
+    if isempty(int_vars)
+        model.termination_status = MOI.OPTIMAL
+        model.primal_status = MOI.FEASIBLE_POINT
+        return
+    end
+    search = DepthFirstSearch(())
+    indomain = IndomainMin(())
+    select = InputOrderSelect(
+        (Store, Vector{Var}, Indomain),
+        model.inner, int_vars, indomain,
+    )
+    result = jcall(
+        search, "labeling", jboolean, (Store, SelectChoicePoint),
+        model.inner, select,
+    )
+    if result != 0
+        model.termination_status = MOI.OPTIMAL
+        model.primal_status = MOI.FEASIBLE_POINT
+    else
+        model.termination_status = MOI.INFEASIBLE
+        model.primal_status = MOI.NO_SOLUTION
+    end
+    return
+end
+
+function MOI.get(model::Optimizer, ::MOI.TerminationStatus)
+    return model.termination_status
+end
+
+function MOI.get(model::Optimizer, ::MOI.PrimalStatus)
+    return model.primal_status
+end
+
+function MOI.get(model::Optimizer, ::MOI.ResultCount)
+    return model.primal_status == MOI.FEASIBLE_POINT ? 1 : 0
+end
+
+function MOI.get(model::Optimizer, ::MOI.VariablePrimal, vi::MOI.VariableIndex)
+    v = _info(model, vi).variable
+    return Int(jcall(v, "value", jint, ()))
+end

src/MOI/wrapper_constraints_cp.jl

@@ -1,29 +1,29 @@
 # Good source of mappings from MiniZinc: 
 # https://github.com/radsz/jacop/blob/develop/src/main/java/org/jacop/fz/constraints/GlobalConstraints.java
 
-# CP.AllDifferent
+# MOI.AllDifferent
 function MOI.supports_constraint(
     ::Optimizer,
     ::Type{F},
     ::Type{S},
 ) where {
     F <: MOI.VectorOfVariables,
-    S <: CP.AllDifferent,
+    S <: MOI.AllDifferent,
 }
     return true
 end
 
 function _build_constraint(
     model::Optimizer,
     f::MOI.VectorOfVariables,
-    ::CP.AllDifferent,
+    ::MOI.AllDifferent,
 )
     # This could also be Alldiff or Alldistinct, with various algorithms
     # for filtering behind. TODO: add a parameter to choose?
     # http://jacopguide.osolpro.com/guideJaCoP.pdf#subsection.3.3.1
     # fzn-jacop uses Alldiff: 
     # https://github.com/radsz/jacop/blob/develop/src/main/java/org/jacop/fz/constraints/GlobalConstraints.java#L279
-    return Alldifferent(_parse_to_vars(model, f))
+    return Alldifferent((Vector{IntVar},), _parse_to_vars(model, f))
 end
 
 # CP.Domain

src/MOI/wrapper_constraints_mo.jl

@@ -6,7 +6,10 @@ function _build_constraint(
     s::MOI.GreaterThan{T},
 ) where {T <: Real}
     coeffs, vars, constant = _parse_to_coeffs_vars(model, f)
-    return LinearInt(model.inner, coeffs, vars, ">=", s.constant - constant)
+    return LinearInt(
+        (Store, Vector{jint}, Vector{IntVar}, JString, jint),
+        model.inner, coeffs, vars, ">=", Int32(s.constant - constant),
+    )
 end
 
 function _build_constraint(
@@ -15,7 +18,10 @@ function _build_constraint(
     s::MOI.LessThan{T},
 ) where {T <: Real}
     coeffs, vars, constant = _parse_to_coeffs_vars(model, f)
-    return LinearInt(model.inner, coeffs, vars, "<=", s.constant - constant)
+    return LinearInt(
+        (Store, Vector{jint}, Vector{IntVar}, JString, jint),
+        model.inner, coeffs, vars, "<=", Int32(s.constant - constant),
+    )
 end
 
 function _build_constraint(
@@ -24,7 +30,10 @@ function _build_constraint(
     s::MOI.EqualTo{T},
 ) where {T <: Real}
     coeffs, vars, constant = _parse_to_coeffs_vars(model, f)
-    return LinearInt(model.inner, coeffs, vars, "==", s.constant - constant)
+    return LinearInt(
+        (Store, Vector{jint}, Vector{IntVar}, JString, jint),
+        model.inner, coeffs, vars, "==", Int32(s.constant - constant),
+    )
 end
 
 # No vector of constraints, there is no more efficient way to do it.

src/MOI/wrapper_constraints_singlevar.jl

@@ -40,13 +40,64 @@ function MOI.is_valid(
            _info(model, index).lb == _info(model, index).ub
 end
 
-function _build_constraint(
+function MOI.add_constraint(
     model::Optimizer,
     f::MOI.VariableIndex,
     s::MOI.EqualTo{T},
 ) where {T <: Integer}
     v = _info(model, f).variable
-    return XeqC(v, s.value)
+    constr = XeqC((IntVar, jint), v, Int32(s.value))
+    jacop_add_constraint_to_store(model.inner, constr)
+    _info(model, f).lb = s.value
+    _info(model, f).ub = s.value
+    index = MOI.ConstraintIndex{MOI.VariableIndex, MOI.EqualTo{T}}(f.value)
+    model.constraint_info[index] = ConstraintInfo(index, constr, f, s)
+    return index
+end
+
+function MOI.add_constraint(
+    model::Optimizer,
+    f::MOI.VariableIndex,
+    s::MOI.LessThan{T},
+) where {T <: Integer}
+    v = _info(model, f).variable
+    constr = XlteqC((IntVar, jint), v, Int32(s.upper))
+    jacop_add_constraint_to_store(model.inner, constr)
+    _info(model, f).ub = s.upper
+    index = MOI.ConstraintIndex{MOI.VariableIndex, MOI.LessThan{T}}(f.value)
+    model.constraint_info[index] = ConstraintInfo(index, constr, f, s)
+    return index
+end
+
+function MOI.add_constraint(
+    model::Optimizer,
+    f::MOI.VariableIndex,
+    s::MOI.GreaterThan{T},
+) where {T <: Integer}
+    v = _info(model, f).variable
+    constr = XgteqC((IntVar, jint), v, Int32(s.lower))
+    jacop_add_constraint_to_store(model.inner, constr)
+    _info(model, f).lb = s.lower
+    index = MOI.ConstraintIndex{MOI.VariableIndex, MOI.GreaterThan{T}}(f.value)
+    model.constraint_info[index] = ConstraintInfo(index, constr, f, s)
+    return index
+end
+
+function MOI.add_constraint(
+    model::Optimizer,
+    f::MOI.VariableIndex,
+    s::MOI.Interval{T},
+) where {T <: Integer}
+    v = _info(model, f).variable
+    lb_constr = XgteqC((IntVar, jint), v, Int32(s.lower))
+    ub_constr = XlteqC((IntVar, jint), v, Int32(s.upper))
+    jacop_add_constraint_to_store(model.inner, lb_constr)
+    jacop_add_constraint_to_store(model.inner, ub_constr)
+    _info(model, f).lb = s.lower
+    _info(model, f).ub = s.upper
+    index = MOI.ConstraintIndex{MOI.VariableIndex, MOI.Interval{T}}(f.value)
+    model.constraint_info[index] = ConstraintInfo(index, nothing, f, s)
+    return index
 end
 
 function MOI.is_valid(

src/java_wrapper.jl

@@ -6,33 +6,37 @@
 # These correspond to Java types (which are directly returned by the functions
 # in this binder). In particular, the inheritance defined in Java is not brought
 # back to Julia.
-const Store = JavaObject{Symbol("org.jacop.core.Store")}
+const Store = @jimport org.jacop.core.Store
 
-const BooleanVar = JavaObject{Symbol("org.jacop.core.BooleanVar")}
-const IntVar = JavaObject{Symbol("org.jacop.core.IntVar")}
-const SetVar = JavaObject{Symbol("org.jacop.set.core.SetVar")}
-const FloatVar = JavaObject{Symbol("org.jacop.floats.core.FloatVar")}
-const CircuitVar = JavaObject{Symbol("org.jacop.constraints.CircuitVar")}
+const Var = @jimport org.jacop.core.Var
+const BooleanVar = @jimport org.jacop.core.BooleanVar
+const IntVar = @jimport org.jacop.core.IntVar
+const SetVar = @jimport org.jacop.set.core.SetVar
+const FloatVar = @jimport org.jacop.floats.core.FloatVar
+const CircuitVar = @jimport org.jacop.constraints.CircuitVar
 
-const Constraint = JavaObject{Symbol("org.jacop.constraints.Constraint")}
-const LinearInt = JavaObject{Symbol("org.jacop.constraints.LinearInt")}
-const Alldifferent = JavaObject{Symbol("org.jacop.constraints.Alldifferent")}
-const In = JavaObject{Symbol("org.jacop.constraints.In")}
-const XeqC = JavaObject{Symbol("org.jacop.constraints.XeqC")}
+const Constraint = @jimport org.jacop.constraints.Constraint
+const LinearInt = @jimport org.jacop.constraints.LinearInt
+const Alldifferent = @jimport org.jacop.constraints.Alldifferent
+const In = @jimport org.jacop.constraints.In
+const XeqC = @jimport org.jacop.constraints.XeqC
+const XlteqC = @jimport org.jacop.constraints.XlteqC
+const XgteqC = @jimport org.jacop.constraints.XgteqC
+
+# Search types.
+const DepthFirstSearch = @jimport org.jacop.search.DepthFirstSearch
+const InputOrderSelect = @jimport org.jacop.search.InputOrderSelect
+const IndomainMin = @jimport org.jacop.search.IndomainMin
+const Indomain = @jimport org.jacop.search.Indomain
+const SelectChoicePoint = @jimport org.jacop.search.SelectChoicePoint
 
 # Unions of types to model Java type hierarchy.
 
-const Variable = Union{
-    BooleanVar,
-    IntVar,
-    SetVar,
-    FloatVar,
-    CircuitVar,
-}
+const Variable = Union{BooleanVar, IntVar, SetVar, FloatVar, CircuitVar}
 
 # Add a constraint to a store.
 
-function jacop_add_constraint_to_store(store::Store, constraint::Constraint)
+function jacop_add_constraint_to_store(store::Store, constraint)
     jcall(store, "impose", Nothing, (Constraint,), constraint)
     return
 end