Merge pull request #107 from JuliaOpt/bl/name

Add name test
JuliaOpt · Mar 19, 2018 · 368ddc9 · 368ddc9
2 parents ddf8d0c + f1eacdc
commit 368ddc9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/bridge.jl b/src/bridge.jl
@@ -98,12 +98,14 @@ for f in (:canget, :canset)
         MOI.$f(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, index::Type{<:MOI.Index}) = MOI.$f(b.model, attr, index)
     end
 end
-for f in (:set!, :get, :get!)
-    @eval begin
-        MOI.$f(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, index::MOI.Index) = MOI.$f(b.model, attr, index)
-        MOI.$f(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, indices::Vector{<:MOI.Index}) = MOI.$f(b.model, attr, indices)
-    end
-end
+MOI.get(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, index::MOI.Index) = MOI.get(b.model, attr, index)
+MOI.get(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, indices::Vector{<:MOI.Index}) = MOI.get(b.model, attr, indices)
+MOI.set!(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, index::MOI.Index, value) = MOI.set!(b.model, attr, index, value)
+MOI.set!(b::AbstractBridgeOptimizer, attr::Union{MOI.AbstractVariableAttribute, MOI.AbstractConstraintAttribute}, indices::Vector{<:MOI.Index}, values::Vector) = MOI.set!(b.model, attr, indices, values)
+
+# Name
+MOI.canget(b::AbstractBridgeOptimizer, IdxT::Type{<:MOI.Index}, name::String) = MOI.canget(b.model, IdxT, name)
+MOI.get(b::AbstractBridgeOptimizer, IdxT::Type{<:MOI.Index}, name::String) = MOI.get(b.model, IdxT, name)
 
 # Constraints
 MOI.supportsconstraint(b::AbstractBridgeOptimizer, ::Type{F}, ::Type{S}) where {F<:MOI.AbstractFunction, S<:MOI.AbstractSet} = MOI.supportsconstraint(b.model, F, S)

diff --git a/test/bridge.jl b/test/bridge.jl
@@ -21,6 +21,10 @@ end
 @testset "BridgeOptimizer" begin
     const model = SplitInterval{Int}(SimpleModel{Int}())
 
+    @testset "Name test" begin
+        MOIT.nametest(SplitInterval{Float64}(SimpleModel{Float64}()))
+    end
+
     @testset "Custom test" begin
         x, y = MOI.addvariables!(model, 2)
         @test MOI.get(model, MOI.NumberOfVariables()) == 2