Skip to content

Commit 7e412bd

Browse files
committed
Update README and tests.
1 parent 87bfb85 commit 7e412bd

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ The `sdplib` directory contains three semidefinite programming problems from the
1010
```julia-repl
1111
julia> using FileIO, LinearAlgebra, JuMP
1212
13-
julia> import MathOptChordalDecomposition, MosekTools, Mosek
13+
julia> import MosekTools, Mosek
14+
15+
julia> import MathOptChordalDecomposition as MOCD
1416
1517
julia> function construct_model(f, name::String)
1618
# load data
@@ -39,20 +41,18 @@ julia> model = construct_model(Mosek.Optimizer, "mcp124-1");
3941
julia> @time JuMP.optimize!(model)
4042
6.005076 seconds (2.53 k allocations: 515.859 KiB)
4143
42-
julia> MOI.get(model, MOI.ObjectiveValue())
44+
julia> objective_value(model)
4345
141.9904770422396
4446
```
4547

4648
Solve the problem using [Mosek.jl](https://github.com/MOSEK/Mosek.jl) and MathOptChordalDecomposition.jl.
4749

4850
```julia-repl
49-
julia> model = construct_model("mcp124-1") do
50-
MathOptChordalDecomposition.Optimizer(Mosek.Optimizer)
51-
end;
51+
julia> model = construct_model(() -> MOCD.Optimizer(Mosek.Optimizer), "mcp124-1");
5252
5353
julia> @time JuMP.optimize!(model)
5454
0.041175 seconds (230.72 k allocations: 11.800 MiB)
5555
56-
julia> MOI.get(model.moi_backend.optimizer.model.inner, MOI.ObjectiveValue())
56+
julia> objective_value(model)
5757
141.99047611570586
5858
```

test/runtests.jl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ using LinearAlgebra
33
using JuMP
44
using Test
55

6-
import MathOptChordalDecomposition
6+
import MathOptChordalDecomposition as MOCD
77
import Mosek
88
import MosekTools
99

@@ -25,29 +25,29 @@ function construct_model(f, name::String)
2525
end
2626

2727
model = construct_model("mcp124-1") do
28-
MathOptChordalDecomposition.Optimizer(Mosek.Optimizer)
28+
MOCD.Optimizer(Mosek.Optimizer)
2929
end
3030

3131
JuMP.optimize!(model)
32-
@test round(MOI.get(model.moi_backend.optimizer.model.inner, MOI.ObjectiveValue()); digits = 2) == 141.99
32+
@test round(objective_value(model); digits = 2) == 141.99
3333

3434
model = construct_model("mcp124-2") do
35-
MathOptChordalDecomposition.Optimizer(Mosek.Optimizer)
35+
MOCD.Optimizer(Mosek.Optimizer)
3636
end
3737

3838
JuMP.optimize!(model)
39-
@test round(MOI.get(model.moi_backend.optimizer.model.inner, MOI.ObjectiveValue()); digits = 2) == 269.88
39+
@test round(objective_value(model); digits = 2) == 269.88
4040

4141
model = construct_model("mcp124-3") do
42-
MathOptChordalDecomposition.Optimizer(Mosek.Optimizer)
42+
MOCD.Optimizer(Mosek.Optimizer)
4343
end
4444

4545
JuMP.optimize!(model)
46-
@test round(MOI.get(model.moi_backend.optimizer.model.inner, MOI.ObjectiveValue()); digits = 2) == 467.75
46+
@test round(objective_value(model); digits = 2) == 467.75
4747

4848
model = construct_model("mcp124-4") do
49-
MathOptChordalDecomposition.Optimizer(Mosek.Optimizer)
49+
MOCD.Optimizer(Mosek.Optimizer)
5050
end
5151

5252
JuMP.optimize!(model)
53-
@test round(MOI.get(model.moi_backend.optimizer.model.inner, MOI.ObjectiveValue()); digits = 2) == 864.41
53+
@test round(objective_value(model); digits = 2) == 864.41

0 commit comments

Comments
 (0)