From 6f695142d006f5542b246414cc4823a9b56c96e3 Mon Sep 17 00:00:00 2001 From: Jonathan Maddock <78556175+jonmaddock@users.noreply.github.com> Date: Tue, 2 Jul 2024 14:30:17 +0100 Subject: [PATCH] Call optional additional convergence function --- src/pyvmcon/vmcon.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pyvmcon/vmcon.py b/src/pyvmcon/vmcon.py index 0054bb6..41a67d8 100644 --- a/src/pyvmcon/vmcon.py +++ b/src/pyvmcon/vmcon.py @@ -169,9 +169,9 @@ def solve( callback(i, result, x, convergence_info) - if additional_convergence and ( - overwrite_convergence_criteria or convergence_info < epsilon - ): + if additional_convergence( + result, x, delta, lamda_equality, lamda_inequality + ) and (overwrite_convergence_criteria or convergence_info < epsilon): break # perform a linesearch along the search direction