Merge branch 'master' into variance_derivative_style

tyongcdf · Jan 12, 2021 · d0e0144 · d0e0144
2 parents 172fd9b + 7514c36
commit d0e0144
Show file tree

Hide file tree

Showing 17 changed files with 272 additions and 74 deletions.
diff --git a/doc/_src_docs/surrogate_models/kpls.rst b/doc/_src_docs/surrogate_models/kpls.rst
diff --git a/doc/_src_docs/surrogate_models/kpls_Test_test_kpls.png b/doc/_src_docs/surrogate_models/kpls_Test_test_kpls.png
diff --git a/doc/_src_docs/surrogate_models/kplsk.rst b/doc/_src_docs/surrogate_models/kplsk.rst
diff --git a/doc/_src_docs/surrogate_models/kplsk_Test_test_kplsk.png b/doc/_src_docs/surrogate_models/kplsk_Test_test_kplsk.png
diff --git a/doc/_src_docs/surrogate_models/krg.rst b/doc/_src_docs/surrogate_models/krg.rst
diff --git a/doc/_src_docs/surrogate_models/krg_Test_test_krg.png b/doc/_src_docs/surrogate_models/krg_Test_test_krg.png
diff --git a/doc/_src_docs/surrogate_models/krg_Test_test_mixed_int_krg.png b/doc/_src_docs/surrogate_models/krg_Test_test_mixed_int_krg.png
diff --git a/smt/applications/mfk.py b/smt/applications/mfk.py
@@ -687,7 +687,9 @@ def _check_param(self):
                 if len(self.options["theta0"]) == 1:
                     self.options["theta0"] *= np.ones((self.nlvl, d))
                 elif len(self.options["theta0"]) == self.nlvl:
-                    self.options["theta0"] = np.array(self.options["theta0"]).reshape(-1, 1)
+                    self.options["theta0"] = np.array(self.options["theta0"]).reshape(
+                        -1, 1
+                    )
                     self.options["theta0"] *= np.ones((1, d))
                 else:
                     raise ValueError(

diff --git a/smt/applications/tests/test_ego.py b/smt/applications/tests/test_ego.py
@@ -95,7 +95,7 @@ def test_function_test_1d_parallel(self):
         self.assertAlmostEqual(-15.1, float(y_opt), delta=1)
 
     def test_rosenbrock_2D(self):
-        n_iter = 40
+        n_iter = 50
         fun = Rosenbrock(ndim=2)
         xlimits = fun.xlimits
         criterion = "UCB"  #'EI' or 'SBO' or 'UCB'
@@ -106,7 +106,7 @@ def test_rosenbrock_2D(self):
             n_iter=n_iter,
             criterion=criterion,
             xlimits=xlimits,
-            random_state=0,  # change seed as it fails on travis macos py3.7
+            random_state=0,
         )
 
         x_opt, y_opt, _, _, _ = ego.optimize(fun=fun)
@@ -299,7 +299,12 @@ def test_ydoe_option(self):
         ydoe = fun(xdoe)
 
         ego = EGO(
-            xdoe=xdoe, ydoe=ydoe, n_iter=n_iter, criterion=criterion, xlimits=xlimits
+            xdoe=xdoe,
+            ydoe=ydoe,
+            n_iter=n_iter,
+            criterion=criterion,
+            xlimits=xlimits,
+            random_state=42,
         )
         _, y_opt, _, _, _ = ego.optimize(fun=fun)