fix ResultCount for unbounded problems

scipopt · Dec 22, 2018 · f4b71d8 · f4b71d8
1 parent 0abb816
commit f4b71d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/MOI_wrapper.jl b/src/MOI_wrapper.jl
@@ -329,7 +329,13 @@ function MOI.get(o::Optimizer, ::MOI.PrimalStatus)
  SCIPgetNSols(get_scip(o)) > 0 ? MOI.FEASIBLE_POINT : MOI.NO_SOLUTION
 end
 
-MOI.get(o::Optimizer, ::MOI.ResultCount) = SCIPgetNSols(get_scip(o))
+function MOI.get(o::Optimizer, ::MOI.ResultCount)
+ status = SCIPgetStatus(get_scip(o))
+ if status in [SCIP_STATUS_UNBOUNDED, SCIP_STATUS_INFORUNBD]
+ return 0
+ end
+ return SCIPgetNSols(get_scip(o))
+end
 
 function MOI.get(o::Optimizer, ::MOI.ObjectiveValue)
  scip = get_scip(o)

diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl
@@ -10,8 +10,6 @@ const config = MOIT.TestConfig(duals=false, infeas_certificates=false)
  "linear1", # needs MOI.delete
  "linear5", # needs MOI.delete
  "linear7", # needs MOI.VectorAffineFunction
- "linear8b", # TODO: have solutions for unbounded problem
- "linear8c", # TODO: have solutions for unbounded problem
  "linear11", # needs MOI.delete
  "linear13", # TODO: support MOI.FEASIBILITY_SENSE
  "linear14", # needs MOI.delete