Fixes

jump-dev · Dec 21, 2023 · 96c04a6 · 96c04a6
1 parent 7348a98
commit 96c04a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl
@@ -451,23 +451,16 @@ function MOI.get(model::Optimizer, ::MOI.TerminationStatus)
     end
 end
 
-function MOI.get(m::Optimizer, attr::MOI.PrimalStatus)
+function MOI.get(m::Optimizer, attr::Union{MOI.PrimalStatus,MOI.DualStatus})
     if attr.result_index > MOI.get(m, MOI.ResultCount())
         return MOI.NO_SOLUTION
     elseif MOI.get(m, MOI.TerminationStatus()) != MOI.LOCALLY_SOLVED
-        return UNKNOWN_RESULT_STATUS
+        return MOI.UNKNOWN_RESULT_STATUS
     else
         return MOI.FEASIBLE_POINT
     end
 end
 
-function MOI.get(m::Optimizer, attr::MOI.DualStatus)
-    if attr.result_index > MOI.get(m, MOI.ResultCount())
-        return MOI.NO_SOLUTION
-    end
-    return MOI.FEASIBLE_POINT
-end
-
 function MOI.get(model::Optimizer, ::MOI.ResultCount)
     if MOI.get(model, MOI.TerminationStatus()) == MOI.OPTIMIZE_NOT_CALLED
         return 0

diff --git a/test/test_simple.jl b/test/test_simple.jl
@@ -65,6 +65,8 @@ function _test_limit(attr, val, term)
     MOI.set(model, MOI.RawOptimizerAttribute(attr), val)
     MOI.optimize!(model)
     @test MOI.get(model, MOI.TerminationStatus()) == term
+    @test MOI.get(model, MOI.PrimalStatus()) == MOI.UNKNOWN_RESULT_STATUS
+    @test MOI.get(model, MOI.DualStatus()) == MOI.UNKNOWN_RESULT_STATUS
 end
 
 @testset "majiter" begin
@@ -94,15 +96,12 @@ end
     MOI.optimize!(model)
     @test MOI.get(model, MOI.RawOptimizerAttribute("majiter")) >=
           SDPLR.MAX_MAJITER
-    MOI.set(model, MOI.RawOptimizerAttribute("majiter"), SDPLR.MAX_MAJITER - 2)
-    @test MOI.get(model, MOI.RawOptimizerAttribute("majiter")) ==
-          SDPLR.MAX_MAJITER - 2
-    MOI.optimize!(model)
-    @test MOI.get(model, MOI.RawOptimizerAttribute("majiter")) >=
-          SDPLR.MAX_MAJITER
-    MOI.set(model, MOI.RawOptimizerAttribute("majiter"), SDPLR.MAX_MAJITER - 2)
-    @test MOI.get(model, MOI.RawOptimizerAttribute("majiter")) ==
-          SDPLR.MAX_MAJITER - 2
-    MOI.optimize!(model)
+    @test MOI.get(model, MOI.TerminationStatus()) == MOI.ITERATION_LIMIT
+    for i in 1:5
+        MOI.set(model, MOI.RawOptimizerAttribute("majiter"), SDPLR.MAX_MAJITER - 2)
+        @test MOI.get(model, MOI.RawOptimizerAttribute("majiter")) ==
+              SDPLR.MAX_MAJITER - 2
+        MOI.optimize!(model)
+    end
     simple_test(model, X, c)
 end