From 6d0b4d03e57360d62212ea80286e59f34afaf096 Mon Sep 17 00:00:00 2001 From: Hendrych Date: Tue, 24 Oct 2023 14:06:29 +0200 Subject: [PATCH] Rename SOLVABLE to OPTIMAL. --- src/blmo_interface.jl | 4 ++-- src/cube_blmo.jl | 2 +- src/strong_branching.jl | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blmo_interface.jl b/src/blmo_interface.jl index 61f7b7d69..0260e9e27 100644 --- 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 index 329f56c2a..386cb59e2 100644 --- 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 index 19d76938e..24860f7f9 100644 --- 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]