From 5905a5a06fd555c73c73aebe7eb15ea2985a1d20 Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Sun, 7 May 2023 05:44:51 -0700 Subject: [PATCH] remove cube2 suffix from candidates --- thursday/candidates/{dlibcube2.py => dlib.py} | 2 +- .../candidates/{evolopycube2.py => evolopy.py} | 0 .../candidates/{fcmaescube2.py => fcmaes.py} | 0 .../{nevergradcube2.py => nevergrad.py} | 0 thursday/candidates/{nloptcube2.py => nlopt.py} | 0 thursday/candidates/{notwacube2.py => notwa.py} | 0 .../candidates/{randomcube2.py => random.py} | 0 thursday/candidates/{scipycube2.py => scipy.py} | 0 thursday/notwacube.py | 16 ++++++++-------- 9 files changed, 9 insertions(+), 9 deletions(-) rename thursday/candidates/{dlibcube2.py => dlib.py} (92%) rename thursday/candidates/{evolopycube2.py => evolopy.py} (100%) rename thursday/candidates/{fcmaescube2.py => fcmaes.py} (100%) rename thursday/candidates/{nevergradcube2.py => nevergrad.py} (100%) rename thursday/candidates/{nloptcube2.py => nlopt.py} (100%) rename thursday/candidates/{notwacube2.py => notwa.py} (100%) rename thursday/candidates/{randomcube2.py => random.py} (100%) rename thursday/candidates/{scipycube2.py => scipy.py} (100%) diff --git a/thursday/candidates/dlibcube2.py b/thursday/candidates/dlib.py similarity index 92% rename from thursday/candidates/dlibcube2.py rename to thursday/candidates/dlib.py index e0e6e36..a69ae9c 100644 --- a/thursday/candidates/dlibcube2.py +++ b/thursday/candidates/dlib.py @@ -1,5 +1,5 @@ from dlib import find_min_global -from .randomcube2 import another_random_cube +from .random import another_random_cube from ..utils import wrap_untrustworthy, final diff --git a/thursday/candidates/evolopycube2.py b/thursday/candidates/evolopy.py similarity index 100% rename from thursday/candidates/evolopycube2.py rename to thursday/candidates/evolopy.py diff --git a/thursday/candidates/fcmaescube2.py b/thursday/candidates/fcmaes.py similarity index 100% rename from thursday/candidates/fcmaescube2.py rename to thursday/candidates/fcmaes.py diff --git a/thursday/candidates/nevergradcube2.py b/thursday/candidates/nevergrad.py similarity index 100% rename from thursday/candidates/nevergradcube2.py rename to thursday/candidates/nevergrad.py diff --git a/thursday/candidates/nloptcube2.py b/thursday/candidates/nlopt.py similarity index 100% rename from thursday/candidates/nloptcube2.py rename to thursday/candidates/nlopt.py diff --git a/thursday/candidates/notwacube2.py b/thursday/candidates/notwa.py similarity index 100% rename from thursday/candidates/notwacube2.py rename to thursday/candidates/notwa.py diff --git a/thursday/candidates/randomcube2.py b/thursday/candidates/random.py similarity index 100% rename from thursday/candidates/randomcube2.py rename to thursday/candidates/random.py diff --git a/thursday/candidates/scipycube2.py b/thursday/candidates/scipy.py similarity index 100% rename from thursday/candidates/scipycube2.py rename to thursday/candidates/scipy.py diff --git a/thursday/notwacube.py b/thursday/notwacube.py index a38b1db..8ff162f 100644 --- a/thursday/notwacube.py +++ b/thursday/notwacube.py @@ -1,8 +1,8 @@ -from .candidates.dlibcube2 import dlib_cube -from .candidates.evolopycube2 import make_evolopy -from .candidates.nevergradcube2 import NEVERGRAD2_OPTIMIZERS -from .candidates.nloptcube2 import nlopt_neldermead_cube -from .candidates.fcmaescube2 import ( +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, @@ -12,9 +12,9 @@ from .candidates.fcmaescube2 import ( make_gclde, make_lclde, ) -from .candidates.notwacube2 import make_birect, make_mercury, make_soo -from .candidates.randomcube2 import another_random_cube, quasirandom_cube -from .candidates.scipycube2 import ( +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,