reorganize standalone libraries into internal and external submodules

thursday/candidates/evolopy.py

@@ -3,20 +3,20 @@ import numpy as np
 
 
 def make_evolopy(optimizer_name, popsize=None):
-    from evolopy.BAT import BAT
-    from evolopy.CS import CS
-    from evolopy.DE import DE
-    from evolopy.FFA import FFA
-    from evolopy.GA import GA
-    from evolopy.GWO import GWO
-    from evolopy.HHO import HHO
-    from evolopy.JAYA import JAYA
-    from evolopy.MFO import MFO
-    from evolopy.MVO import MVO
-    from evolopy.PSO import PSO
-    from evolopy.SCA import SCA
-    from evolopy.SSA import SSA
-    from evolopy.WOA import WOA
+    from ..external.evolopy.BAT import BAT
+    from ..external.evolopy.CS import CS
+    from ..external.evolopy.DE import DE
+    from ..external.evolopy.FFA import FFA
+    from ..external.evolopy.GA import GA
+    from ..external.evolopy.GWO import GWO
+    from ..external.evolopy.HHO import HHO
+    from ..external.evolopy.JAYA import JAYA
+    from ..external.evolopy.MFO import MFO
+    from ..external.evolopy.MVO import MVO
+    from ..external.evolopy.PSO import PSO
+    from ..external.evolopy.SCA import SCA
+    from ..external.evolopy.SSA import SSA
+    from ..external.evolopy.WOA import WOA
     from unittest.mock import patch
 
     def no_print(*args, **kwargs):

thursday/candidates/notwa.py

@@ -4,7 +4,7 @@ import numpy as np
 
 
 def make_birect(deepness=23, *, longest=False, pruning=False):
-    from ..birect import birect
+    from ..internal.birect import birect
 
     def f(objective, n_trials, n_dim, with_count):
         feval_count = 0
@@ -37,7 +37,7 @@ def make_soo(deepness=None, *, K=3):
     if deepness is None:
         deepness = int(31 * np.log(2) / np.log(K) - 1e-8)
     assert K >= 2
-    from ..soo import soo
+    from ..internal.soo import soo
 
     def f(objective, n_trials, n_dim, with_count):
         feval_count = 0
@@ -61,7 +61,7 @@ def make_soo(deepness=None, *, K=3):
 def make_mercury(
     flags, bounding="clip", *, isigma=tt.IV, popsize=2, irate=1, seed=None
 ):
-    from ..hg import minimize as hg
+    from ..internal.hg import minimize as hg
 
     def f(objective, n_trials, n_dim, with_count):
         _objective = wrap_untrustworthy(objective, n_trials, bounding=bounding)

thursday/go_benchmarks.py

@@ -1,4 +1,4 @@
-from go_benchmark_functions import *
+from .external.go_benchmark_functions import *
 from inspect import getmro, isclass
 
 _looky_here = False