Merge branch 'master' into master

SMTorg · Apr 26, 2024 · 1d79b58 · 1d79b58
2 parents e8a1201 + 95a7dbd
commit 1d79b58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/smt/utils/design_space.py b/smt/utils/design_space.py
@@ -939,7 +939,7 @@ def add_value_constraint(
             isinstance(param2, UniformFloatHyperparameter)
         ):
             if isinstance(value1, Sequence):
-                clause1 = ForbiddenInClause(param1, str(value1))
+                clause1 = ForbiddenInClause(param1, list(np.atleast_1d(np.array(value1, dtype=str))))
             else:
                 clause1 = ForbiddenEqualsClause(param1, str(value1))
 

diff --git a/smt/utils/test/test_design_space.py b/smt/utils/test/test_design_space.py
@@ -431,7 +431,7 @@ def test_design_space_hierarchical(self):
     def test_design_space_hierarchical_config_space(self):
         ds = DesignSpace(
             [
-                CategoricalVariable(["A", "B", "C"]),  # x0
+                CategoricalVariable(["A", "B", "Cc"]),  # x0
                 CategoricalVariable(["E", "F"]),  # x1
                 IntegerVariable(0, 1),  # x2
                 FloatVariable(0, 1),  # x3
@@ -442,7 +442,7 @@ def test_design_space_hierarchical_config_space(self):
             decreed_var=3, meta_var=0, meta_value="A"
         )  # Activate x3 if x0 == A
         ds.add_value_constraint(
-            var1=0, value1="C", var2=1, value2="F"
+            var1=0, value1=["Cc"], var2=1, value2="F"
         )  # Prevent a == C and b == F
 
         x_cartesian = np.array(