Add test (#5)

* Add test

* Add MOI wrapper

* Fix

* Add ci

* Add test/Project.toml

Author: blegat

.github/workflows/CompatHelper.yml

@@ -0,0 +1,17 @@
+name: CompatHelper
+on:
+  schedule:
+    - cron: '00 00 * * *'
+jobs:
+  CompatHelper:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: julia-actions/setup-julia@latest
+        with:
+          version: 1.6
+      - name: Pkg.add("CompatHelper")
+        run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
+      - name: CompatHelper.main()
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: julia -e 'using CompatHelper; CompatHelper.main()'

.github/workflows/TagBot.yml

@@ -0,0 +1,15 @@
+name: TagBot
+on:
+  issue_comment:
+    types:
+      - created
+  workflow_dispatch:
+jobs:
+  TagBot:
+    if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: JuliaRegistries/TagBot@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          ssh: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/ci.yml

@@ -0,0 +1,36 @@
+name: CI
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - version: '1.10'
+            os: ubuntu-latest
+            arch: x64
+          - version: '1'
+            os: ubuntu-latest
+            arch: x64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/setup-julia@v2
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: julia-actions/cache@v1
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
+        with:
+          depwarn: error
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v4
+        with:
+          file: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -0,0 +1 @@
+Manifest.toml

src/ComplementOpt.jl

@@ -5,5 +5,6 @@ const MOIU = MOI.Utilities
 
 include("vertical.jl")
 include("nonlinear.jl")
+include("MOI_wrapper.jl")
 
 end # module ComplementOpt

src/MOI_wrapper.jl

@@ -0,0 +1,65 @@
+struct Reformulation <: MOI.AbstractOptimizerAttribute end
+
+struct Optimizer{O<:MOI.ModelLike} <: MOI.AbstractOptimizer
+    optimizer::O
+    reformulation
+    function Optimizer(optimizer::MOI.ModelLike)
+        return new{typeof(optimizer)}(
+            optimizer,
+            NonlinearReformulation(),
+        )
+    end
+end
+
+MOI.is_empty(model::Optimizer) = MOI.is_empty(model.optimizer)
+MOI.empty!(model::Optimizer) = MOI.empty!(model.optimizer)
+
+function MOI.supports(
+    model::Optimizer,
+    attr::Union{
+        MOI.AbstractModelAttribute,
+        MOI.AbstractOptimizerAttribute,
+    },
+)
+    return MOI.supports(model.optimizer, attr)
+end
+
+function MOI.get(
+    model::Optimizer,
+    attr::Union{
+        MOI.AbstractModelAttribute,
+        MOI.AbstractOptimizerAttribute,
+    },
+)
+    return MOI.get(model.optimizer, attr)
+end
+
+function MOI.set(
+    model::Optimizer,
+    attr::Union{
+        MOI.AbstractModelAttribute,
+        MOI.AbstractOptimizerAttribute,
+    },
+    value,
+)
+    return MOI.set(model.optimizer, attr, value)
+end
+
+function MOI.supports_constraint(
+    model::Optimizer,
+    ::Type{F},
+    ::Type{S},
+) where {F<:MOI.AbstractFunction,S<:MOI.AbstractSet}
+    return MOI.supports_constraint(model.optimizer, F, S)
+end
+
+function MOI.copy_to(dest::Optimizer, src::MOI.ModelLike)
+    tmp = MOI.Utilities.UniversalFallback(
+        MOI.Utilities.Model{Float64}()
+    )
+    tmp_index_map = MOI.copy_to(tmp, src)
+    reformulate_to_vertical!(tmp)
+    reformulate_as_nonlinear_program!(tmp)
+    # TODO combine with `tmp_index_map`
+    return MOI.copy_to(dest.optimizer, tmp)
+end

src/nonlinear.jl

@@ -1,3 +1,4 @@
+struct NonlinearReformulation end
 
 """
     reformulate_as_nonlinear_program!(model::MOI.ModelLike; relaxation=0.0)
@@ -94,4 +95,3 @@ function reformulate_as_nonlinear_program!(model::MOI.ModelLike; relaxation=0.0)
     MOI.delete(model, cc_cons)
     return ind_cc
 end
-

src/vertical.jl

@@ -5,10 +5,9 @@ const VF = Union{
 }
 
 function has_complementarity(model::MOI.ModelLike)
-    CC = MOI.Complements
-    cc_vov = MOI.get(model, MOI.ListOfConstraintIndices{MOI.VectorOfVariables, CC}())
-    cc_vf = MOI.get(model, MOI.ListOfConstraintIndices{VF, CC}())
-    return length(cc_vov) >= 1 || length(cc_vf) >= 1
+    return any(MOI.get(model, MOI.ListOfConstraintTypesPresent())) do (F, S)
+        S == MOI.Complements
+    end
 end
 
 #=
@@ -151,8 +150,19 @@ function reformulate_to_vertical!(model::MOI.ModelLike)
 end
 
 function is_vertical(model::MOI.ModelLike)
-    CC = MOI.Complements
-    cc_vov = MOI.get(model, MOI.ListOfConstraintIndices{MOI.VectorOfVariables, CC}())
-    cc_vf = MOI.get(model, MOI.ListOfConstraintIndices{VF, CC}())
-    return length(cc_vov) == 1 && length(cc_vf) == 0
+    one_vov = false
+    for (F, S) in MOI.get(model, MOI.ListOfConstraintTypesPresent())
+        if S == MOI.Complements
+            if F == MOI.VectorOfVariables
+                if MOI.get(model, MOI.NumberOfConstraints{F,S}()) == 1
+                    one_vov = true
+                else
+                    return false
+                end
+            else
+                return false
+            end
+        end
+    end
+    return one_vov
 end

test/Project.toml

@@ -0,0 +1,3 @@
+[deps]
+JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

test/instances.jl

@@ -6,8 +6,8 @@ using JuMP
 function fletcher_leyffer_ex1_model()
     model = Model()
     @variable(model, z[1:2])
+    set_lower_bound(z[2], 0)
     @objective(model, Min, (z[1] - 1)^2 + z[2]^2)
-    @constraint(model, z[2] >= 0)
     @constraint(model, z[2] - z[1] >= 0)
     @constraint(model, [z[2] - z[1], z[2]] ∈ MOI.Complements(2))
     return model
@@ -374,4 +374,3 @@ function water_net_model()
 
     return model
 end
-