From 5628ff10fde3d946f7ea8eeeb56860cc768fa87a Mon Sep 17 00:00:00 2001
From: Paul-Saves <paul.saves@alumni.enac.fr>
Date: Fri, 6 Dec 2024 15:35:40 +0100
Subject: [PATCH] fix

---
 smt/surrogate_models/krg_based.py | 45 +++++++++++++------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/smt/surrogate_models/krg_based.py b/smt/surrogate_models/krg_based.py
index 6567e34c3..768f23591 100644
--- a/smt/surrogate_models/krg_based.py
+++ b/smt/surrogate_models/krg_based.py
@@ -2084,7 +2084,7 @@ def hessian_minus_reduced_likelihood_function(log10t):
             self.D = self._componentwise_distance(D)
 
         # Initialization
-        k, _incr, stop, best_optimal_rlf_value, _max_retry = 0, 0, 1, -1e20, 10
+        k, incr, stop, best_optimal_rlf_value, max_retry = 0, 0, 1, -1e20, 10
         while k < stop:
             # Use specified starting point as first guess
             self.noise0 = np.array(self.options["noise0"])
@@ -2186,31 +2186,12 @@ def hessian_minus_reduced_likelihood_function(log10t):
                 if k > 0:
                     if np.isinf(optimal_rlf_value):
                         stop += 1
-
-                        # One evaluation objectif function is done at least
-                        if self.best_iteration_fail is not None:
-                            if self.best_iteration_fail > best_optimal_rlf_value:
-                                best_optimal_theta = self._thetaMemory
-                                (
-                                    best_optimal_rlf_value,
-                                    best_optimal_par,
-                                ) = self._reduced_likelihood_function(
-                                    theta=best_optimal_theta
-                                )
-                    # Optimization fail
-                    elif np.size(best_optimal_par) == 0:
-                        nugget = self.options["nugget"]
-                        print(
-                            "\033[91mOptimization failed.\033[0m",
-                            end="",
-                            file=sys.stderr,
-                        )
-                        print(
-                            f" Try increasing the 'nugget' above its current value of {nugget}.",
-                            file=sys.stderr,
-                        )
-                        raise ve
-                    # Break the while loop
+                        if incr != 0:
+                            return
+                        if stop > max_retry:
+                            raise ValueError(
+                                "%d attempts to train the model failed" % max_retry
+                            )
                     else:
                         if optimal_rlf_value >= self.best_iteration_fail:
                             if optimal_rlf_value > best_optimal_rlf_value:
@@ -2253,12 +2234,22 @@ def hessian_minus_reduced_likelihood_function(log10t):
                             )
                 # Optimization fail
                 elif np.size(best_optimal_par) == 0:
-                    print("Optimization failed. Try increasing the ``nugget``")
+                    nugget = self.options["nugget"]
+                    print(
+                        "\033[91mOptimization failed.\033[0m",
+                        end="",
+                        file=sys.stderr,
+                    )
+                    print(
+                        f" Try increasing the 'nugget' above its current value of {nugget}.",
+                        file=sys.stderr,
+                    )
                     raise ve
                 # Break the while loop
                 else:
                     k = stop + 1
                     print("fmin_cobyla failed but the best value is retained")
+
         return best_optimal_rlf_value, best_optimal_par, best_optimal_theta
 
     def _check_param(self):