Upgrade egobox 0.8.0 (#9)

* Upgrade egobox 0.8.0: renaming to XType, XSpec, n_iter * Bump 1.2.1 * Black format
whatsopt · Mar 10, 2023 · f029953 · f029953
1 parent 990bdb8
commit f029953
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/openmdao_extensions/__init__.py b/openmdao_extensions/__init__.py
@@ -1 +1 @@
-__version__ = "1.2.0"
+__version__ = "1.2.1"
diff --git a/openmdao_extensions/egobox_doe_driver.py b/openmdao_extensions/egobox_doe_driver.py
@@ -34,7 +34,7 @@ def __call__(self, design_vars, model=None):
                 if name == infos[absname]["prom_name"] and (
                     infos[absname]["tags"] & {"wop:int"}
                 ):
-                    dvs_int[name] = egx.Vtype(egx.Vtype.INT)
+                    dvs_int[name] = egx.XType(egx.XType.INT)
 
             size = meta["size"]
             meta_low = meta["lower"]
@@ -53,10 +53,10 @@ def __call__(self, design_vars, model=None):
                     p_high = meta_high
 
                 if name in dvs_int:
-                    x_specs.append(egx.Vspec(egx.Vtype(egx.Vtype.INT), [p_low, p_high]))
+                    x_specs.append(egx.XSpec(egx.XType(egx.XType.INT), [p_low, p_high]))
                 else:
                     x_specs.append(
-                        egx.Vspec(egx.Vtype(egx.Vtype.FLOAT), [p_low, p_high])
+                        egx.XSpec(egx.XType(egx.XType.FLOAT), [p_low, p_high])
                     )
         cases = egx.lhs(x_specs, self.n_cases)
         sample = []

diff --git a/openmdao_extensions/egobox_egor_driver.py b/openmdao_extensions/egobox_egor_driver.py
@@ -107,7 +107,7 @@ def run(self):
         )
 
         # Run the optim
-        res = egor.minimize(n_eval=n_iter)
+        res = egor.minimize(n_iter=n_iter)
 
         # Set optimal parameters
         i = 0
@@ -132,25 +132,25 @@ def _initialize_vars(self, model):
                 if name == infos[absname]["prom_name"] and (
                     infos[absname]["tags"] & {"wop:int"}
                 ):
-                    dvs_int[name] = egx.Vtype(egx.Vtype.INT)
+                    dvs_int[name] = egx.XType(egx.XType.INT)
 
         variables = []
         desvars = self._designvars
         for name, meta in desvars.items():
-            vartype = dvs_int.get(name, egx.Vtype(egx.Vtype.FLOAT))
+            vartype = dvs_int.get(name, egx.XType(egx.XType.FLOAT))
             if meta["size"] > 1:
                 if np.isscalar(meta["lower"]):
                     variables += [
-                        egx.Vspec(vartype, [meta["lower"], meta["upper"]])
+                        egx.XSpec(vartype, [meta["lower"], meta["upper"]])
                         for i in range(meta["size"])
                     ]
                 else:
                     variables += [
-                        egx.Vspec(vartype, [meta["lower"], meta["upper"]])
+                        egx.XSpec(vartype, [meta["lower"], meta["upper"]])
                         for i in range(meta["size"])
                     ]
             else:
-                variables += [egx.Vspec(vartype, [meta["lower"], meta["upper"]])]
+                variables += [egx.XSpec(vartype, [meta["lower"], meta["upper"]])]
         return variables
 
     def _initialize_cons(self, eq_tol=None, ieq_tol=None):

diff --git a/openmdao_extensions/tests/test_egobox_doe_driver.py b/openmdao_extensions/tests/test_egobox_doe_driver.py
@@ -8,7 +8,6 @@
 
 class TestEgoboxDoeDriver(unittest.TestCase):
     def assert_case_generation(self, n, driver):
-
         pb = om.Problem(Sellar())
 
         pb.model.add_design_var("x", lower=0, upper=10)