parametrize acquisition function tests

NSLS-II · Oct 24, 2023 · 85d92fe · 85d92fe
1 parent 44cf99d
commit 85d92fe
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/bloptools/tests/test_acq_funcs.py b/bloptools/tests/test_acq_funcs.py
@@ -10,4 +10,8 @@ def test_analytic_acq_funcs_single_task(agent, RE, acq_func):
 @pytest.mark.parametrize("acq_func", ["qei", "qpi", "qem", "qucb"])
 def test_monte_carlo_acq_funcs_single_task(agent, RE, acq_func):
     RE(agent.learn("qr", n=32))
-    RE(agent.learn(acq_func, n=4))
+<<<<<<< HEAD
+    RE(agent.learn(acq_func, n=4))
+=======
+    RE(agent.learn(acq_func, n=4))
+>>>>>>> a53c02b (parametrize acquisition function tests)