Fix MOI.SimplexIterations and MOI.BarrierIterations (#197)

Author: odow

src/attributes.jl

@@ -75,20 +75,14 @@ end
 #### Solver/Solution information
 
 function MOI.get(m::Optimizer, ::MOI.SimplexIterations)::Int64
-    miosimiter = Mosek.getlintinf(m.task, Mosek.MSK_LIINF_MIO_SIMPLEX_ITER)
-    if miosimiter > 0
-        return miosimiter
-    end
-    return Mosek.getintinf(m.task, Mosek.MSK_IINF_SIM_PRIMAL_ITER) +
+    return Mosek.getlintinf(m.task, Mosek.MSK_LIINF_MIO_SIMPLEX_ITER) +
+           Mosek.getintinf(m.task, Mosek.MSK_IINF_SIM_PRIMAL_ITER) +
            Mosek.getintinf(m.task, Mosek.MSK_IINF_SIM_DUAL_ITER)
 end
 
 function MOI.get(m::Optimizer, ::MOI.BarrierIterations)::Int64
-    miosimiter = Mosek.getlintinf(m.task, Mosek.MSK_LIINF_MIO_INTPNT_ITER)
-    if miosimiter > 0
-        return miosimiter
-    end
-    return Mosek.getintinf(m.task, Mosek.MSK_IINF_INTPNT_ITER)
+    return Mosek.getlintinf(m.task, Mosek.MSK_LIINF_MIO_INTPNT_ITER) +
+           Mosek.getintinf(m.task, Mosek.MSK_IINF_INTPNT_ITER)
 end
 
 function MOI.get(m::Optimizer, ::MOI.NodeCount)::Int64

test/runtests.jl

@@ -655,9 +655,8 @@ function test_variable_primal_start()
     return
 end
 
-function test_simplex_iterations()
+function test_raw_status_string()
     model = MosekOptimizerWithFallback()
-    MOI.set(model, MOI.Silent(), false)
     @test MOI.get(model, MOI.RawStatusString()) == "MOI.OPTIMIZE_NOT_CALLED"
     MOI.set(
         model,