From ca591bf4da2b3942ede0df1921b35e866359fc86 Mon Sep 17 00:00:00 2001 From: FFroehlich Date: Wed, 3 Feb 2021 15:16:41 -0500 Subject: [PATCH 1/3] update value for MU, accept all steps that yield a decrease in function values --- fides/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fides/constants.py b/fides/constants.py index 4f673c6..a8e3e65 100644 --- a/fides/constants.py +++ b/fides/constants.py @@ -66,7 +66,7 @@ class StepBackStrategy(str, enum.Enum): Options.STEPBACK_STRAT: StepBackStrategy.REFLECT, Options.THETA_MAX: 0.95, Options.DELTA_INIT: 1.0, - Options.MU: 0.25, # [NodedalWright2006] + Options.MU: 0.0, # [NodedalWright2006] Options.ETA: 0.75, # [NodedalWright2006] Options.GAMMA1: 1/4, # [NodedalWright2006] Options.GAMMA2: 2, # [NodedalWright2006] From 7fb9312765d437488319e46b6db8b6b079142d01 Mon Sep 17 00:00:00 2001 From: FFroehlich Date: Thu, 4 Feb 2021 22:21:48 -0500 Subject: [PATCH 2/3] revert mu change, change acceptance criteria --- fides/constants.py | 2 +- fides/minimize.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fides/constants.py b/fides/constants.py index a8e3e65..4f673c6 100644 --- a/fides/constants.py +++ b/fides/constants.py @@ -66,7 +66,7 @@ class StepBackStrategy(str, enum.Enum): Options.STEPBACK_STRAT: StepBackStrategy.REFLECT, Options.THETA_MAX: 0.95, Options.DELTA_INIT: 1.0, - Options.MU: 0.0, # [NodedalWright2006] + Options.MU: 0.25, # [NodedalWright2006] Options.ETA: 0.75, # [NodedalWright2006] Options.GAMMA1: 1/4, # [NodedalWright2006] Options.GAMMA2: 2, # [NodedalWright2006] diff --git a/fides/minimize.py b/fides/minimize.py index f1386cc..b8f8a4b 100644 --- a/fides/minimize.py +++ b/fides/minimize.py @@ -365,7 +365,7 @@ def update_tr_radius(self, self.delta * self.get_option(Options.GAMMA1), nsx / 4 ]) - return self.tr_ratio >= self.get_option(Options.MU) + return self.tr_ratio > 0.0 def check_convergence(self, fval, x, grad) -> None: """ From 82ff37193b273af1200b3581b994a97bddd8c14d Mon Sep 17 00:00:00 2001 From: FFroehlich Date: Thu, 4 Feb 2021 22:22:25 -0500 Subject: [PATCH 3/3] version bump --- fides/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fides/version.py b/fides/version.py index d31c31e..788da1f 100644 --- a/fides/version.py +++ b/fides/version.py @@ -1 +1 @@ -__version__ = "0.2.3" +__version__ = "0.2.4"