allow strings as factor levels

Author: gedeck

doepy/doe_functions.py

@@ -22,9 +22,9 @@ def construct_df(x, r):
     """
     Function for constructing a DataFrame from a numpy array generated by PyDOE function and individual lists
     """
-    result = np.zeros(x.shape)
+    result = []
     for i, row in enumerate(x):
-        result[i, :] = [rcolumn[int(idx)] for rcolumn, idx in zip(r, row)]
+        result.append([rcolumn[int(idx)] for rcolumn, idx in zip(r, row)])
     return pd.DataFrame(result)
 
 

doepy/tests/test_build.py

@@ -10,6 +10,18 @@ def test_full_fact():
     for factor, values in factors.items():
         assert set(df[factor]) == set(values)
 
+    # factorlevels can also be strings
+    factors = {
+        'lr': [5e-4, 2e-4, 1e-3],
+        'iterations': [20000, 40000],
+        'n_pairs': [20, 40, 80],
+        'level': ["LOW", "HIGH"]
+    }
+    df = full_fact(factors)
+    assert len(df) == 3 * 2 * 3 * 2
+    for factor, values in factors.items():
+        assert set(df[factor]) == set(values)
+
 
 def test_frac_fact_res():
     factors = {'A': [1, 5], 'B': [0.3, 0.7], 'C': [10, 15], 'D': [3, 7], 'E': [-2, -1]}