@@ -238,24 +238,24 @@ $(TYPEDSIGNATURES)
238238
239239Check for problem convergence.
240240
241- By default, check if the lower and upper bounds have converged to within absolute
241+ By default, checks if the lower and upper bounds have converged to within absolute
242242and/or relative tolerances.
243243"""
244244function convergence_check (t:: ExtensionType , m:: GlobalOptimizer )
245245
246246 L = m. _lower_objective_value
247247 U = m. _global_upper_bound
248- t = (U - L) <= m. _parameters. absolute_tolerance
249- if (U < Inf ) && (L > Inf )
250- t |= (abs (U - L)/ (max (abs (L), abs (U))) <= m. _parameters. relative_tolerance)
248+ flag = (U - L) <= m. _parameters. absolute_tolerance
249+ if (U < Inf ) && (L > - Inf )
250+ flag |= (abs (U - L)/ (max (abs (L), abs (U))) <= m. _parameters. relative_tolerance)
251251 end
252- if t && m. _min_converged_value < Inf
252+ if flag && m. _min_converged_value < Inf
253253 m. _min_converged_value = min (m. _min_converged_value, L)
254- else
254+ elseif flag
255255 m. _min_converged_value = L
256256 end
257257
258- return t
258+ return flag
259259end
260260convergence_check (m:: GlobalOptimizer{R,S,Q} ) where {R,S,Q<: ExtensionType } = convergence_check (_ext (m), m)
261261
@@ -392,7 +392,7 @@ function global_solve!(m::GlobalOptimizer)
392392 node_selection! (m)
393393 print_node! (m)
394394
395- # Perform prepocessing and log the time
395+ # Perform preprocessing and log the time
396396 m. _last_preprocess_time += @elapsed preprocess! (m)
397397
398398 # Continue if the node has not been proven infeasible
@@ -403,7 +403,7 @@ function global_solve!(m::GlobalOptimizer)
403403 print_results! (m, true )
404404
405405 # Continue if lower problem is not infeasible and problem
406- # problem has not yet converged
406+ # has not yet converged
407407 if m. _lower_feasibility && ! convergence_check (m)
408408
409409 # Solve the upper bounding problem and log the time
0 commit comments