Merge pull request #57 from thomaswmorris/friendly-dofs-and-objs

More user-friendly controls

blop/__init__.py

@@ -1,4 +1,8 @@
+from . import utils  # noqa F401
 from ._version import get_versions
+from .agent import Agent  # noqa F401
+from .dofs import DOF  # noqa F401
+from .objectives import Objective  # noqa F401
 
 __version__ = get_versions()["version"]
 del get_versions

blop/bayesian/__init__.py

@@ -1,3 +0,0 @@
-from .agent import *  # noqa F401
-from .dofs import *  # noqa F401
-from .objectives import *  # noqa F401

blop/bayesian/acquisition/__init__.py

@@ -18,15 +18,10 @@
 
 
 def parse_acq_func_identifier(identifier):
-    acq_func_name = None
-    for _acq_func_name in config.keys():
-        if identifier.lower() in config[_acq_func_name]["identifiers"]:
-            acq_func_name = _acq_func_name
-
-    if acq_func_name is None:
-        raise ValueError(f'Unrecognized acquisition function identifier "{identifier}".')
-
-    return acq_func_name
+    for acq_func_name in config.keys():
+        if identifier.lower() in config[acq_func_name]["identifiers"]:
+            return acq_func_name
+    return None
 
 
 def get_acquisition_function(agent, identifier="qei", return_metadata=True, verbose=False, **acq_func_kwargs):
@@ -35,6 +30,9 @@ def get_acquisition_function(agent, identifier="qei", return_metadata=True, verb
     """
 
     acq_func_name = parse_acq_func_identifier(identifier)
+    if acq_func_name is None:
+        raise ValueError(f'Unrecognized acquisition function identifier "{identifier}".')
+
     acq_func_config = config["upper_confidence_bound"]
 
     if config[acq_func_name]["multitask_only"] and (len(agent.objectives) == 1):