From e4f501dd9fd27bf471c918ba75c0c0290cec0eab Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <michiel.cottaar@ndcn.ox.ac.uk>
Date: Mon, 25 Mar 2024 15:21:51 +0000
Subject: [PATCH] Allow scanner to be unset
---
src/build_sequences.jl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/build_sequences.jl b/src/build_sequences.jl
index 2252aaf..dd51dfd 100644
--- a/src/build_sequences.jl
+++ b/src/build_sequences.jl
@@ -2,7 +2,7 @@ module BuildSequences
import JuMP: Model, optimizer_with_attributes, optimize!, AbstractJuMPScalar, value, solution_summary, termination_status, LOCALLY_SOLVED, OPTIMAL, num_variables, all_variables, set_start_value, ALMOST_LOCALLY_SOLVED
import Ipopt
import Juniper
-import ..Scanners: Scanner, gradient_strength
+import ..Scanners: Scanner, gradient_strength, Default_Scanner
const GLOBAL_MODEL = Ref(Model())
const IGNORE_MODEL = GLOBAL_MODEL[]
@@ -93,10 +93,12 @@ function build_sequence(f::Function, scanner::Union{Nothing, Scanner}, optimiser
build_sequence(f, scanner, model, optimise, n_attempts)
end
-function build_sequence(f::Function, scanner::Union{Nothing, Scanner}; print_level=2, kwargs...)
+function build_sequence(f::Function, scanner::Union{Nothing, Scanner}=Default_Scanner; print_level=2, kwargs...)
build_sequence(f, scanner, Ipopt.Optimizer; print_level=print_level, kwargs...)
end
+build_sequence(f::Function, optimiser_constructor; kwargs...) = build_sequence(f, Default_Scanner, optimiser_constructor; kwargs...)
+
function global_model()
if GLOBAL_MODEL[] == IGNORE_MODEL
--
GitLab