Rename SOLVABLE to OPTIMAL.

ZIB-IOL · Oct 24, 2023 · 6d0b4d0 · 6d0b4d0
1 parent 0cc3fa1
commit 6d0b4d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/blmo_interface.jl b/src/blmo_interface.jl
@@ -9,7 +9,7 @@ abstract type BoundedLinearMinimizationOracle <: FrankWolfe.LinearMinimizationOr
 Enum encoding the status of the Bounded Linear Minimization Oracle.
 """
 @enum BLMOStatus begin
-    SOLVABLE = 0
+    OPTIMAL = 0
     INFEASIBLE = 1
     UNBOUNDED = 2
 end
@@ -139,7 +139,7 @@ end
 Check if problem is bounded and feasible, i.e. no contradicting constraints.
 """
 function check_feasibility(blmo::BoundedLinearMinimizationOracle)
-    return SOLVABLE
+    return OPTIMAL
 end
 
 """

diff --git a/src/cube_blmo.jl b/src/cube_blmo.jl
@@ -162,7 +162,7 @@ function check_feasibility(blmo::CubeBLMO)
             return INFEASIBLE
         end
     end
-    return SOLVABLE
+    return OPTIMAL
 end
 
 function is_valid_split(tree::Bonobo.BnBTree, blmo::CubeBLMO, vidx::Int)

diff --git a/src/strong_branching.jl b/src/strong_branching.jl
@@ -39,7 +39,7 @@ function Bonobo.get_branching_variable(
                 Bonobo.get_branching_indices(tree.root),
             )
             status = check_feasibility(branching.bounded_lmo)
-            if status == SOLVABLE
+            if status == OPTIMAL
                 empty!(active_set)
                 for (λ, v) in node.active_set
                     if v[idx] <= xrel[idx]
@@ -78,7 +78,7 @@ function Bonobo.get_branching_variable(
                 Bonobo.get_branching_indices(tree.root),
             )
             status = check_feasibility(branching.bounded_lmo)
-            if status == SOLVABLES
+            if status == OPTIMALS
                 empty!(active_set)
                 for (λ, v) in node.active_set
                     if v[idx] >= xrel[idx]