Merge pull request #44 from jajcayn/feature/simplify_imports

Feature/simplify imports

Author: Nikola Jajcay

gpso/__init__.py

@@ -6,3 +6,7 @@
     S. (2018). Bayesian Optimisation of Large-Scale Biophysical Networks.
     NeuroImage, 174, 219-236.
 """
+
+from .gp_surrogate import GPSurrogate
+from .optimisation import GPSOptimiser
+from .param_space import ParameterSpace

tests/test_callbacks.py

@@ -8,14 +8,14 @@
 
 import numpy as np
 import pytest
+from gpso import GPSOptimiser, ParameterSpace
 from gpso.callbacks import (
     GPFlowCheckpoints,
     PostIterationPlotting,
     PostUpdateLogging,
     PreFinaliseSave,
 )
-from gpso.optimisation import CallbackTypes, GPSOCallback, GPSOptimiser
-from gpso.param_space import ParameterSpace
+from gpso.optimisation import CallbackTypes, GPSOCallback
 from gpso.utils import JSON_EXT, LOG_EXT, PKL_EXT, set_logger
 
 TEMP_FOLDER = os.path.join(os.path.dirname(os.path.abspath(__file__)), "temp")

tests/test_optimisation.py

@@ -8,9 +8,8 @@
 
 import numpy as np
 import pytest
+from gpso import GPSOptimiser, ParameterSpace
 from gpso.gp_surrogate import GPPoint
-from gpso.optimisation import GPSOptimiser
-from gpso.param_space import ParameterSpace
 
 TEMP_FOLDER = "temp_optimisation_test"
 

tests/test_plotting.py

@@ -8,8 +8,7 @@
 
 import numpy as np
 import pytest
-from gpso.optimisation import GPSOptimiser
-from gpso.param_space import ParameterSpace
+from gpso import GPSOptimiser, ParameterSpace
 from gpso.plotting import (
     plot_conditional_surrogate_distributions,
     plot_parameter_marginal_distributions,