rename notwacube to parties (of candidates)

This commit is contained in:
Connor Olding 2023-05-07 06:41:38 -07:00
parent f0ea7750aa
commit db5473da43
2 changed files with 4 additions and 5 deletions

View File

@ -1,6 +1,6 @@
from .go_benchmark_lists import *
from .go_benchmarks import problems_2d, problems_3d, problems_4d
from .notwacube import book_of_optimizers
from .parties import parties
from .utilities import OWrap, COWrap, m1, m33, m36, prog
from .utilities import perform_another_experimental_scoring_method
import numpy as np
@ -310,8 +310,7 @@ def main(argv):
# percents = dict(frugal_percent=0.1, greedy_percent=1.5)
percents = dict(frugal_percent=1.0, greedy_percent=2.0)
book = book_of_optimizers
which = book[argv[1]] if len(argv) > 1 else book["standard"]
which = parties[argv[1]] if len(argv) > 1 else parties["standard"]
n_dim = int(argv[2]) if len(argv) > 2 else -2
n_trials = int(argv[3]) if len(argv) > 3 else fib(abs(n_dim) + 4) * 10
@ -323,7 +322,7 @@ def main(argv):
optimizers = list(which) # copy
before = len(optimizers)
# if which is not book["everything"]:
# if which is not parties["everything"]:
optimizers = [opt for opt in optimizers if optimizer_filter(opt.__name__)]
after = len(optimizers)
s = "s" if before - after != 1 else ""

View File

@ -112,7 +112,7 @@ else:
if opt.__name__.removesuffix("_cube") not in blacklisted
]
book_of_optimizers = dict(
parties = dict(
baseline=BASELINE_OPTIMIZERS,
everything=FUCKING_EVERYTHING,
evolopy=EVOLOPY_OPTIMIZERS,