Skip to content

Commit 5d2cb5a

Browse files
committed
Improve testing guideline
1 parent 0aff518 commit 5d2cb5a

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

docs/src/apimanual.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -576,28 +576,28 @@ The skeleton below can be used for the wrapper test file of a solver name `FooBa
576576
using MathOptInterface
577577
const MOI = MathOptInterface
578578
const MOIT = MOI.Test
579-
const MOIU = MOI.Utilities
580579
const MOIB = MOI.Bridges
581580

582-
# Include here the functions/sets supported by the solver wrapper (not those that are supported through bridges)
583-
MOIU.@model FooBarModelData () (EqualTo, GreaterThan, LessThan) (Zeros, Nonnegatives, Nonpositives) () (SingleVariable,) (ScalarAffineFunction,) (VectorOfVariables,) (VectorAffineFunction,)
584-
585-
MOIB.@bridge SplitInterval MOIB.SplitIntervalBridge () (Interval,) () () () (ScalarAffineFunction,) () ()
586-
MOIB.@bridge GeoMean MOIB.GeoMeanBridge () () (GeometricMeanCone,) () () () (VectorOfVariables,) (VectorAffineFunction,)
587-
MOIB.@bridge RootDet MOIB.RootDetBridge () () (RootDetConeTriangle,) () () () (VectorOfVariables,) (VectorAffineFunction,)
588-
589581
const optimizer = FooBarOptimizer()
590582
const config = MOIT.TestConfig(atol=1e-6, rtol=1e-6)
591583

592584
@testset "MOI Continuous Linear" begin
593-
MOIT.contlineartest(SplitInterval{Float64}(MOIU.CachingOptimizer(FooBarModelData{Float64}(), optimizer)), config)
585+
MOIT.contlineartest(MOIB.SplitInterval{Float64}(optimizer), config)
594586
end
595587

596588
@testset "MOI Continuous Conic" begin
597-
MOIT.contlineartest(RootDet{Float64}(GeoMean{Float64}(MOIU.CachingOptimizer(FooBarModelData{Float64}(), optimizer))), config)
589+
MOIT.contlineartest(MOIB.RootDet{Float64}(MOIB.GeoMean{Float64}(optimizer)), config)
598590
end
599591

600592
@testset "MOI Integer Conic" begin
601-
MOIT.intconictest(MOIU.CachingOptimizer(FooBarModelData{Float64}(), optimizer), config)
593+
MOIT.intconictest(optimizer, config)
602594
end
603595
```
596+
597+
If the wrapper does not support building the model incrementally (i.e. with `addvariable!` and `addconstraint!`), the line `const optimizer = FooBarOptimizer()` can be replaced with
598+
```julia
599+
const MOIU = MOI.Utilities
600+
# Include here the functions/sets supported by the solver wrapper (not those that are supported through bridges)
601+
MOIU.@model FooBarModelData () (EqualTo, GreaterThan, LessThan) (Zeros, Nonnegatives, Nonpositives) () (SingleVariable,) (ScalarAffineFunction,) (VectorOfVariables,) (VectorAffineFunction,)
602+
const optimizer = MOIU.CachingOptimizer(FooBarModelData{Float64}(), FooBarOptimizer())
603+
```

0 commit comments

Comments
 (0)