From a8595d2616871d715c8675190ea6e1023388cc46 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Sun, 7 May 2023 06:16:08 -0700
Subject: [PATCH] move imports of candidates into init script

---
 thursday/candidates/__init__.py | 43 +++++++++++++++++++++++++++++++
 thursday/notwacube.py           | 45 +--------------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)
 create mode 100644 thursday/candidates/__init__.py

diff --git a/thursday/candidates/__init__.py b/thursday/candidates/__init__.py
new file mode 100644
index 0000000..7df799b
--- /dev/null
+++ b/thursday/candidates/__init__.py
@@ -0,0 +1,43 @@
+from .dlib import dlib_cube
+from .evolopy import make_evolopy
+from .nevergrad import NEVERGRAD2_OPTIMIZERS
+from .nlopt import nlopt_neldermead_cube
+from .fcmaes import (
+    make_biteopt,
+    make_csma,
+    make_fcmaes,
+    make_crfmnes,
+    # make_lde,
+    make_da,
+    make_gclde,
+    make_lclde,
+)
+from .notwa import make_birect, make_mercury, make_soo
+from .random import another_random_cube, quasirandom_cube
+from .scipy import (
+    make_shgo,
+    scipy_basinhopping_cube,
+    scipy_bfgs_2j_cube,
+    scipy_bfgs_3j_cube,
+    scipy_cg_2j_cube,
+    scipy_cg_3j_cube,
+    scipy_cobyla_cube,
+    scipy_direct_cube,
+    scipy_direct_l_cube,
+    # scipy_dogleg_cube,
+    scipy_lbfgsb_2j_cube,
+    scipy_lbfgsb_3j_cube,
+    scipy_neldermead_cube,
+    # scipy_newtoncg_cube,
+    scipy_powell_cube,
+    scipy_slsqp_2j_cube,
+    scipy_slsqp_3j_cube,
+    scipy_tnc_2j_cube,
+    scipy_tnc_3j_cube,
+    scipy_trustconstr_2j_cube,
+    scipy_trustconstr_3j_cube,
+    # scipy_trustexact_2j_cube,
+    # scipy_trustexact_3j_cube,
+    # scipy_trustkrylov_cube,
+    # scipy_trustncg_cube,
+)
diff --git a/thursday/notwacube.py b/thursday/notwacube.py
index 8ff162f..e663bec 100644
--- a/thursday/notwacube.py
+++ b/thursday/notwacube.py
@@ -1,48 +1,5 @@
-from .candidates.dlib import dlib_cube
-from .candidates.evolopy import make_evolopy
-from .candidates.nevergrad import NEVERGRAD2_OPTIMIZERS
-from .candidates.nlopt import nlopt_neldermead_cube
-from .candidates.fcmaes import (
-    make_biteopt,
-    make_csma,
-    make_fcmaes,
-    make_crfmnes,
-    # make_lde,
-    make_da,
-    make_gclde,
-    make_lclde,
-)
-from .candidates.notwa import make_birect, make_mercury, make_soo
-from .candidates.random import another_random_cube, quasirandom_cube
-from .candidates.scipy import (
-    make_shgo,
-    scipy_basinhopping_cube,
-    scipy_bfgs_2j_cube,
-    scipy_bfgs_3j_cube,
-    scipy_cg_2j_cube,
-    scipy_cg_3j_cube,
-    scipy_cobyla_cube,
-    scipy_direct_cube,
-    scipy_direct_l_cube,
-    # scipy_dogleg_cube,
-    scipy_lbfgsb_2j_cube,
-    scipy_lbfgsb_3j_cube,
-    scipy_neldermead_cube,
-    # scipy_newtoncg_cube,
-    scipy_powell_cube,
-    scipy_slsqp_2j_cube,
-    scipy_slsqp_3j_cube,
-    scipy_tnc_2j_cube,
-    scipy_tnc_3j_cube,
-    scipy_trustconstr_2j_cube,
-    scipy_trustconstr_3j_cube,
-    # scipy_trustexact_2j_cube,
-    # scipy_trustexact_3j_cube,
-    # scipy_trustkrylov_cube,
-    # scipy_trustncg_cube,
-)
-
 from . import tinytweaks as tt
+from .candidates import *
 
 BASELINE_OPTIMIZERS = [
     another_random_cube,