From 824b684ca63f0503cb9eadc781ad19236265ccf1 Mon Sep 17 00:00:00 2001 From: Contramundum Date: Thu, 31 Aug 2023 17:38:39 +0900 Subject: [PATCH] format --- examples/preferential-optimization/generator.py | 4 +--- optuna_dashboard/preferential/_study.py | 8 +++----- optuna_dashboard/preferential/_system_attrs.py | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/preferential-optimization/generator.py b/examples/preferential-optimization/generator.py index d429b5db..1a498fe7 100644 --- a/examples/preferential-optimization/generator.py +++ b/examples/preferential-optimization/generator.py @@ -20,8 +20,6 @@ artifact_path = os.path.join(os.path.dirname(__file__), "artifact") artifact_backend = FileSystemBackend(base_path=artifact_path) os.makedirs(artifact_path, exist_ok=True) -n_comparison = 5 - def main() -> NoReturn: study = create_study( @@ -35,7 +33,7 @@ def main() -> NoReturn: while True: # If n_comparison "best" trials (that are not reported bad) exists, # the generator waits for human evaluation. - if study.should_generate(): + if not study.should_generate(): time.sleep(0.1) # Avoid busy-loop continue diff --git a/optuna_dashboard/preferential/_study.py b/optuna_dashboard/preferential/_study.py index c793a982..16c81b66 100644 --- a/optuna_dashboard/preferential/_study.py +++ b/optuna_dashboard/preferential/_study.py @@ -280,8 +280,8 @@ class PreferentialStudy: Returns :obj:`True` if the number of trials not reported bad and not skipped are less than :attr:`~optuna_dashboard.preferential.PreferentialStudy.n_generate`. Users are recommended - to generate a new trial if this method returns :obj:`True`, and to wait for human evaluation - if this method returns :obj:`False`. + to generate a new trial if this method returns :obj:`True`, and to wait for human + evaluation if this method returns :obj:`False`. """ return len(self.best_trials) < self.n_generate @@ -360,9 +360,7 @@ def create_study( study._storage.set_study_system_attr( study._study_id, _SYSTEM_ATTR_PREFERENTIAL_STUDY, True ) - study._storage.set_study_system_attr( - study._study_id, _SYSTEM_ATTR_N_GENERATE, 4 # Default n_generate is 4 - ) + set_n_generate(study._study_id, study._storage, 4) # Default n_generate return PreferentialStudy(study) except optuna.exceptions.DuplicatedStudyError: diff --git a/optuna_dashboard/preferential/_system_attrs.py b/optuna_dashboard/preferential/_system_attrs.py index 5970f0d3..2964c9e0 100644 --- a/optuna_dashboard/preferential/_system_attrs.py +++ b/optuna_dashboard/preferential/_system_attrs.py @@ -67,7 +67,7 @@ def get_n_generate(study_system_attrs: dict[str, Any]) -> int: return study_system_attrs[_SYSTEM_ATTR_N_GENERATE] -def set_n_generate(study_id: int, n_generate: int, storage: BaseStorage) -> None: +def set_n_generate(study_id: int, storage: BaseStorage, n_generate: int) -> None: storage.set_study_system_attr( study_id=study_id, key=_SYSTEM_ATTR_N_GENERATE,