Merge remote-tracking branch 'origin' into preferential-history

python_tests/preferential/test_study.py

@@ -25,7 +25,7 @@ from ..storage_supplier import StorageSupplier
 @parametrize_storages
 def test_study_set_and_get_user_attrs(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
 
         study.set_user_attr("dataset", "MNIST")
         assert study.user_attrs["dataset"] == "MNIST"
@@ -34,7 +34,7 @@ def test_study_set_and_get_user_attrs(storage_supplier: Callable[[], StorageSupp
 @parametrize_storages
 def test_report_and_get_preferences(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         assert len(study.preferences) == 0
 
         for _ in range(2):
@@ -51,7 +51,9 @@ def test_report_and_get_preferences(storage_supplier: Callable[[], StorageSuppli
 
 
 def test_study_pickle() -> None:
-    study_1 = create_study()
+    study_1 = create_study(
+        n_generate=4,
+    )
     for _ in range(10):
         study_1.ask()
     assert len(study_1.trials) == 10
@@ -69,13 +71,17 @@ def test_study_pickle() -> None:
 def test_create_study(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
         # Test creating a new study.
-        study = create_study(storage=storage, load_if_exists=False)
+        study = create_study(n_generate=4, storage=storage, load_if_exists=False)
 
         # Test `load_if_exists=True` with existing study.
-        create_study(study_name=study.study_name, storage=storage, load_if_exists=True)
+        create_study(
+            n_generate=4, study_name=study.study_name, storage=storage, load_if_exists=True
+        )
 
         with pytest.raises(DuplicatedStudyError):
-            create_study(study_name=study.study_name, storage=storage, load_if_exists=False)
+            create_study(
+                n_generate=4, study_name=study.study_name, storage=storage, load_if_exists=False
+            )
 
 
 @parametrize_storages
@@ -92,7 +98,7 @@ def test_load_study(storage_supplier: Callable[[], StorageSupplier]) -> None:
             load_study(study_name=study_name, storage=storage)
 
         # Create a new study.
-        created_study = create_study(study_name=study_name, storage=storage)
+        created_study = create_study(n_generate=4, study_name=study_name, storage=storage)
 
         # Test loading an existing study.
         loaded_study = load_study(study_name=study_name, storage=storage)
@@ -108,7 +114,7 @@ def test_load_study_study_name_none(storage_supplier: Callable[[], StorageSuppli
 
         study_name = str(uuid.uuid4())
 
-        _ = create_study(study_name=study_name, storage=storage)
+        _ = create_study(n_generate=4, study_name=study_name, storage=storage)
 
         loaded_study = load_study(study_name=None, storage=storage)
 
@@ -116,7 +122,7 @@ def test_load_study_study_name_none(storage_supplier: Callable[[], StorageSuppli
 
         study_name = str(uuid.uuid4())
 
-        _ = create_study(study_name=study_name, storage=storage)
+        _ = create_study(n_generate=4, study_name=study_name, storage=storage)
 
         # Ambiguous study.
         with pytest.raises(ValueError):
@@ -131,7 +137,7 @@ def test_delete_study(storage_supplier: Callable[[], StorageSupplier]) -> None:
             delete_study(study_name="invalid-study-name", storage=storage)
 
         # Test deleting an existing study.
-        study = create_study(storage=storage, load_if_exists=False)
+        study = create_study(n_generate=4, storage=storage, load_if_exists=False)
         delete_study(study_name=study.study_name, storage=storage)
 
         # Test failed to delete the study which is already deleted.
@@ -141,7 +147,7 @@ def test_delete_study(storage_supplier: Callable[[], StorageSupplier]) -> None:
 
 def test_copy_study() -> None:
     with StorageSupplier("sqlite") as from_storage, StorageSupplier("sqlite") as to_storage:
-        from_study = create_study(storage=from_storage)
+        from_study = create_study(n_generate=4, storage=from_storage)
         from_study.set_user_attr("baz", "qux")
         for _ in range(3):
             trial = from_study.ask()
@@ -165,8 +171,8 @@ def test_copy_study() -> None:
 
 def test_copy_study_to_study_name() -> None:
     with StorageSupplier("sqlite") as from_storage, StorageSupplier("sqlite") as to_storage:
-        from_study = create_study(study_name="foo", storage=from_storage)
-        _ = create_study(study_name="foo", storage=to_storage)
+        from_study = create_study(n_generate=4, study_name="foo", storage=from_storage)
+        _ = create_study(n_generate=4, study_name="foo", storage=to_storage)
 
         with pytest.raises(DuplicatedStudyError):
             copy_study(
@@ -188,7 +194,7 @@ def test_copy_study_to_study_name() -> None:
 @parametrize_storages
 def test_add_trial(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         assert len(study.trials) == 0
 
         trial = create_trial(value=0)
@@ -198,7 +204,9 @@ def test_add_trial(storage_supplier: Callable[[], StorageSupplier]) -> None:
 
 
 def test_add_trial_invalid_values_length() -> None:
-    study = create_study()
+    study = create_study(
+        n_generate=4,
+    )
     trial = create_trial(values=[0, 0])
     with pytest.raises(ValueError):
         study.add_trial(trial)
@@ -207,7 +215,7 @@ def test_add_trial_invalid_values_length() -> None:
 @parametrize_storages
 def test_add_trials(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         assert len(study.trials) == 0
 
         study.add_trials([])
@@ -220,7 +228,7 @@ def test_add_trials(storage_supplier: Callable[[], StorageSupplier]) -> None:
             assert trial.number == i
             assert trial.value == i
 
-        other_study = create_study(storage=storage)
+        other_study = create_study(n_generate=4, storage=storage)
         other_study.add_trials(study.trials)
         assert len(other_study.trials) == 3
         for i, trial in enumerate(other_study.trials):
@@ -231,7 +239,7 @@ def test_add_trials(storage_supplier: Callable[[], StorageSupplier]) -> None:
 @parametrize_storages
 def test_get_trials(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         for _ in range(5):
             trial = study.ask()
             trial.suggest_int("x", 1, 5)
@@ -256,7 +264,7 @@ def test_get_trials(storage_supplier: Callable[[], StorageSupplier]) -> None:
 @parametrize_storages
 def test_get_trials_state_option(storage_supplier: Callable[[], StorageSupplier]) -> None:
     with storage_supplier() as storage:
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         for _ in range(3):
             trial = study.ask()
             study.mark_comparison_ready(trial)
@@ -286,7 +294,9 @@ def test_get_trials_state_option(storage_supplier: Callable[[], StorageSupplier]
 
 
 def test_ask() -> None:
-    study = create_study()
+    study = create_study(
+        n_generate=4,
+    )
 
     trial = study.ask()
     assert isinstance(trial, Trial)
@@ -298,7 +308,9 @@ def test_ask_fixed_search_space() -> None:
         "y": distributions.CategoricalDistribution(["bacon", "spam"]),
     }
 
-    study = create_study()
+    study = create_study(
+        n_generate=4,
+    )
     trial = study.ask(fixed_distributions=fixed_distributions)
 
     params = trial.params
@@ -312,7 +324,7 @@ def test_report_preferences_from_another_process() -> None:
 
     with StorageSupplier("sqlite") as storage:
         # Create a study and ask for a new trial.
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         study.ask()
         study.ask()
 

python_tests/test_api.py

@@ -102,7 +102,7 @@ class APITestCase(TestCase):
 
     def test_get_best_trials_of_preferential_study(self) -> None:
         storage = optuna.storages.InMemoryStorage()
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         for _ in range(3):
             trial = study.ask()
             study.mark_comparison_ready(trial)
@@ -125,7 +125,7 @@ class APITestCase(TestCase):
 
     def test_report_preference(self) -> None:
         storage = optuna.storages.InMemoryStorage()
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         for _ in range(3):
             trial = study.ask()
             study.mark_comparison_ready(trial)
@@ -183,7 +183,7 @@ class APITestCase(TestCase):
 
     def test_skip_trial(self) -> None:
         storage = optuna.storages.InMemoryStorage()
-        study = create_study(storage=storage)
+        study = create_study(n_generate=4, storage=storage)
         trials: list[optuna.Trial] = []
         for _ in range(3):
             trial = study.ask()

python_tests/test_serializers.py

@@ -24,7 +24,7 @@ def test_serialize_dict() -> None:
 
 def test_get_study_detail_is_preferential() -> None:
     storage = optuna.storages.InMemoryStorage()
-    study = create_study(storage=storage)
+    study = create_study(n_generate=4, storage=storage)
     study_summaries = get_study_summaries(storage)
     assert len(study_summaries) == 1
 
@@ -46,7 +46,7 @@ def test_get_study_detail_is_not_preferential() -> None:
 
 def test_get_study_summary_is_preferential() -> None:
     storage = optuna.storages.InMemoryStorage()
-    create_study(storage=storage)
+    create_study(n_generate=4, storage=storage)
     study_summaries = get_study_summaries(storage)
     assert len(study_summaries) == 1