Improve test coverage

Author: odow

src/mockoptimizer.jl

@@ -137,6 +137,8 @@ const SUPPORTED_CONSTRAINTS = [
     (LQOI.SinVar, LQOI.IV),
     (LQOI.SinVar, MOI.ZeroOne),
     (LQOI.SinVar, MOI.Integer),
+    (LQOI.SinVar, MOI.Semiinteger{Float64}),
+    (LQOI.SinVar, MOI.Semicontinuous{Float64}),
     (LQOI.VecVar, LQOI.SOS1),
     (LQOI.VecVar, LQOI.SOS2),
     (LQOI.VecVar, MOI.Nonnegatives),
@@ -542,19 +544,9 @@ function LQOI.delete_quadratic_constraints!(instance::MockLinQuadOptimizer, rowb
     end
 end
 
-# TODO fix types
-function variabletype(::MockLinQuadOptimizer, typeval)
-    if typeval == 'B'
-        return 'B'
-    elseif typeval == 'I'
-        return 'I'
-    else
-        return 'C'
-    end
-end
 function LQOI.change_variable_types!(instance::MockLinQuadOptimizer, colvec, typevec)
     for i in eachindex(colvec)
-        instance.inner.vartype[colvec[i]] = variabletype(instance, typevec[i])
+        instance.inner.vartype[colvec[i]] = typevec[i]
     end
 end
 

test/runtests.jl

@@ -144,13 +144,13 @@ end
 
 MOIU.@model(ModelComplete,
     (MOI.ZeroOne, MOI.Integer),
-    (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval, 
+    (MOI.EqualTo, MOI.GreaterThan, MOI.LessThan, MOI.Interval,
      MOI.Semicontinuous, MOI.Semiinteger),
-    (MOI.Reals, MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives, 
-     MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone, 
-     MOI.ExponentialCone, MOI.DualExponentialCone, 
-     MOI.PositiveSemidefiniteConeTriangle, MOI.PositiveSemidefiniteConeSquare, 
-     MOI.RootDetConeTriangle, MOI.RootDetConeSquare, MOI.LogDetConeTriangle, 
+    (MOI.Reals, MOI.Zeros, MOI.Nonnegatives, MOI.Nonpositives,
+     MOI.SecondOrderCone, MOI.RotatedSecondOrderCone, MOI.GeometricMeanCone,
+     MOI.ExponentialCone, MOI.DualExponentialCone,
+     MOI.PositiveSemidefiniteConeTriangle, MOI.PositiveSemidefiniteConeSquare,
+     MOI.RootDetConeTriangle, MOI.RootDetConeSquare, MOI.LogDetConeTriangle,
      MOI.LogDetConeSquare),
     (MOI.PowerCone, MOI.DualPowerCone, MOI.SOS1, MOI.SOS2),
     (MOI.SingleVariable,),
@@ -377,3 +377,28 @@ end
     objective_type_test(convert(MOI.ScalarAffineFunction{Float64}, f))
     objective_type_test(convert(MOI.ScalarQuadraticFunction{Float64}, f))
 end
+
+@testset "SemiXXX variables" begin
+    @testset "Semiinteger" begin
+        model = LQOI.MockLinQuadOptimizer()
+        x = MOI.add_variable(model)
+        c = MOI.add_constraint(
+            model, MOI.SingleVariable(x), MOI.Semiinteger(1.0, 4.5))
+        @test model.inner.vartype[1] == Cchar('N')
+        @test MOI.get(model, MOI.ConstraintSet(), c) == MOI.Semiinteger(1.0, 4.5)
+        @test MOI.get(model, MOI.ConstraintFunction(), c) == MOI.SingleVariable(x)
+        MOI.delete(model, c)
+        @test model.inner.vartype[1] == Cchar('C')
+    end
+    @testset "Semicontinuous" begin
+        model = LQOI.MockLinQuadOptimizer()
+        x = MOI.add_variable(model)
+        c = MOI.add_constraint(
+            model, MOI.SingleVariable(x), MOI.Semicontinuous(1.0, 4.0))
+        @test model.inner.vartype[1] == Cchar('S')
+        @test MOI.get(model, MOI.ConstraintSet(), c) == MOI.Semicontinuous(1.0, 4.0)
+        @test MOI.get(model, MOI.ConstraintFunction(), c) == MOI.SingleVariable(x)
+        MOI.delete(model, c)
+        @test model.inner.vartype[1] == Cchar('C')
+    end
+end