Skip to content

Commit 0748f2a

Browse files
committed
Update to MOI v0.9
1 parent 6ebf072 commit 0748f2a

File tree

4 files changed

+55
-17
lines changed

4 files changed

+55
-17
lines changed

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ os:
44
- osx
55
julia:
66
- 1.0
7+
- 1.1
78

89
notifications:
910
email: false
11+
12+
before_script:
13+
- julia -e 'using Pkg; Pkg.add(PackageSpec(name="MathOptInterface", rev="master"))'
14+
- julia -e 'using Pkg; Pkg.add(PackageSpec(name="SemidefiniteOptInterface", rev="bl/moiv0.9"))'
1015

1116
after_success:
1217
# push coverage results to Coveralls and Codecov

Project.toml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name = "SDPA"
2+
uuid = "b9a10b5b-afa4-512f-a053-bb3d8080febc"
3+
repo = "https://github.com/JuliaOpt/SDPA.jl.git"
4+
version = "0.2.0"
5+
6+
[deps]
7+
BinaryProvider = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
8+
CxxWrap = "1f15a43c-97ca-5a2a-ae31-89f07a497df4"
9+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
10+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11+
MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
12+
MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
13+
SemidefiniteModels = "169818f4-1a3d-53bf-95b3-11177825b1e3"
14+
SemidefiniteOptInterface = "f0680fed-b2cd-5302-98f9-f4da282d86b5"
15+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
16+
17+
[compat]
18+
BinaryProvider = "≥ 0.5.3"
19+
CxxWrap = "0.8"
20+
MathOptInterface = "0.9"
21+
MathProgBase = "0.7"
22+
SemidefiniteModels = "~0.1.1"
23+
SemidefiniteOptInterface = "0.6"
24+
julia = "1"
25+
26+
[extras]
27+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
28+
29+
[targets]
30+
test = ["Test"]

REQUIRE

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/MOI_wrapper.jl

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@ const MOIT = MOI.Test
44
const MOIU = MOI.Utilities
55
const MOIB = MOI.Bridges
66

7+
import SDPA
8+
const optimizer = SDPA.Optimizer()
9+
10+
@testset "SolverName" begin
11+
@test MOI.get(optimizer, MOI.SolverName()) == "SDPA"
12+
end
13+
714
MOIU.@model(SDModelData,
815
(),
916
(MOI.EqualTo, MOI.GreaterThan, MOI.LessThan),
@@ -16,21 +23,24 @@ MOIU.@model(SDModelData,
1623
(MOI.VectorAffineFunction,))
1724
# UniversalFallback is needed for starting values, even if they are ignored by SDPA
1825
const cache = MOIU.UniversalFallback(SDModelData{Float64}())
19-
const optimizer = MOIU.CachingOptimizer(cache,
20-
SDPA.Optimizer())
26+
const cached = MOIU.CachingOptimizer(cache, optimizer)
27+
const bridged = MOIB.full_bridge_optimizer(cached, Float64)
2128
# test 1e-3 because of rsoc3 test, otherwise, 1e-5 is enough
2229
const config = MOIT.TestConfig(atol=1e-3, rtol=1e-3)
2330

24-
@testset "SolverName" begin
25-
@test MOI.get(optimizer, MOI.SolverName()) == "SDPA"
31+
@testset "Unit" begin
32+
MOIT.unittest(bridged, config,
33+
[# Multiple variable constraints on same variable
34+
"solve_with_lowerbound", "solve_affine_interval",
35+
"solve_with_upperbound",
36+
# Quadratic functions are not supported
37+
"solve_qcp_edge_cases", "solve_qp_edge_cases",
38+
# Integer and ZeroOne sets are not supported
39+
"solve_integer_edge_cases", "solve_objbound_edge_cases"])
2640
end
27-
2841
@testset "Linear tests" begin
29-
MOIT.contlineartest(MOIB.SplitInterval{Float64}(optimizer), config,
30-
["linear12"])
42+
MOIT.contlineartest(bridged, config, ["linear12"])
3143
end
3244
@testset "Conic tests" begin
33-
MOIT.contconictest(MOIB.RootDet{Float64}(MOIB.GeoMean{Float64}(MOIB.RSOCtoPSD{Float64}(MOIB.SOCtoPSD{Float64}(optimizer)))),
34-
config,
35-
["lin3", "soc3", "psds", "rootdets", "logdet", "exp"])
45+
MOIT.contconictest(bridged, config, ["lin3", "soc3", "psds", "rootdets", "logdet", "exp"])
3646
end

0 commit comments

Comments
 (0)